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

[IMP] improved form views 

bzr revid: fp@tinyerp.com-20120608183518-7sllx2v50vsx3ohm
This commit is contained in:
Fabien Pinckaers 2012-06-08 20:35:18 +02:00
parent 4a80610352
commit 7c8e38b179
24 changed files with 539 additions and 582 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
addons/plugin_thunderbird/plugin_thunderbird.xml
View File

@ -1,72 +1,72 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<record id="view_thunderbird_installer" model="ir.ui.view"> <record id="view_thunderbird_installer" model="ir.ui.view">
<field name="name">plugin_thunderbird.installer.view</field> <field name="name">plugin_thunderbird.installer.view</field>
<field name="model">plugin_thunderbird.installer</field> <field name="model">plugin_thunderbird.installer</field>
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="base.res_config_installer"/> <field name="inherit_id" ref="base.res_config_installer"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<data> <data>
<form position="attributes"> <form position="attributes">
<attribute name="string">Install Thunderbird Plug-In</attribute> <attribute name="string">Install Thunderbird Plug-In</attribute>
</form> </form>
<separator string="title" position="before"> <separator string="title" position="before">
<label string="This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/> <label string="This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/>
</separator> </separator>
<xpath expr="//button[@string='Install Modules']" position="replace"> <xpath expr="//button[@string='Install Modules']" position="replace">
<button colspan="1" icon="gtk-close" special="cancel" string="_Close"/> <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
</xpath> </xpath>
<xpath expr="//button[@string='Cancel']" position="replace"></xpath> <xpath expr="//button[@string='Cancel']" position="replace"></xpath>
<xpath expr="//separator[@string='title']" position="after"> <xpath expr="//separator[@string='title']" position="after">
<group colspan="8" height="450" width="750"> <group colspan="8" height="450" width="750">
<field name="thunderbird" invisible="1"/> <field name="thunderbird" invisible="1"/>
<field name="name" invisible="1"/> <field name="name" invisible="1"/>
<field name="pdf_name" invisible="1"/> <field name="pdf_name" invisible="1"/>
<newline/> <newline/>
<field name="plugin_file" filename="name" widget="url"/> <field name="plugin_file" filename="name" widget="url"/>
<newline/> <newline/>
<field name="pdf_file" filename="pdf_name" widget="url"/> <field name="pdf_file" filename="pdf_name" widget="url"/>
<newline/> <newline/>
<separator string="Installation and Configuration Steps" colspan="4"/> <separator string="Installation and Configuration Steps" colspan="4"/>
<field name="description" nolabel="1" colspan="8"/> <field name="description" nolabel="1" colspan="8"/>
</group> </group>
</xpath> </xpath>
<separator string="title" position="attributes"> <separator string="title" position="attributes">
<attribute name="string">Install Thunderbird Plug-In</attribute> <attribute name="string">Install Thunderbird Plug-In</attribute>
</separator> </separator>
</data> </data>
</field> </field>
</record> </record>
<record id="action_thunderbird_installer" model="ir.actions.act_window"> <record id="action_thunderbird_installer" model="ir.actions.act_window">
<field name="name">Install Thunderbird Plug-In</field> <field name="name">Install Thunderbird Plug-In</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">plugin_thunderbird.installer</field> <field name="res_model">plugin_thunderbird.installer</field>
<field name="view_id" ref="view_thunderbird_installer"/> <field name="view_id" ref="view_thunderbird_installer"/>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="target">new</field> <field name="target">new</field>
</record> </record>
<!-- Sales Configuration --> <!-- Sales Configuration -->
<record id="view_config_thunderbird_installer" model="ir.ui.view"> <record id="view_config_thunderbird_installer" model="ir.ui.view">
<field name="name">Sales Application</field> <field name="name">Sales Application</field>
<field name="model">sale.config.settings</field> <field name="model">sale.config.settings</field>
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="base.view_sale_config_settings"/> <field name="inherit_id" ref="base.view_sale_config_settings"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="module_plugin_thunderbird" position="after"> <field name="module_plugin_thunderbird" position="after">
<group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}"> <group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
<button name="%(action_thunderbird_installer)d" type="action" <button name="%(action_thunderbird_installer)d" type="action"
string="Configure Thunderbird Plugin" icon="gtk-execute"/> string="Configure Thunderbird Plugin" icon="gtk-execute"/>
</group> </group>
</field> </field>
</field> </field>
</record> </record>
<!-- <menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10"/>--> <!-- <menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10"/>-->
<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_installer" parent="base.menu_base_config" sequence="10"/> <menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_installer" parent="base.menu_base_config" sequence="10"/>
</data> </data>
</openerp> </openerp>

151
addons/point_of_sale/point_of_sale_view.xml
View File

@ -16,24 +16,28 @@
<field name="model">pos.order</field> <field name="model">pos.order</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="PoS Orders">
<header> <header>
<button name="%(action_pos_payment)d" string="Payment" type="action" states="draft"/> <button name="%(action_pos_payment)d" string="Payment" type="action" states="draft"/>
<button name="%(action_report_pos_receipt)d" string="Reprint" type="action" states="paid,done,invoiced"/> <button name="%(action_report_pos_receipt)d" string="Reprint" type="action" states="paid,done,invoiced"/>
<button name="action_invoice" string="Invoice" icon="gtk-apply" type="object" states="paid" attrs="{'readonly': [('partner_id','=',False)]}"/>
<button name="done" string="Post Entries" icon="gtk-apply" type="workflow" states="paid"/>
<button name="refund" string="Return Products" type="object" <button name="refund" string="Return Products" type="object"
attrs="{'invisible':[('state','=','draft')]}"/> attrs="{'invisible':[('state','=','draft')]}"/>
<field name="state" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/> <field name="state" widget="statusbar" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
</header> </header>
<sheet string="PoS Orders" layout="auto"> <sheet>
<group col="7" colspan="4" class="oe_form_header"> <group>
<field name="name"/> <group>
<field name="date_order"/> <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_customer':1}" attrs="{'readonly': [('state','=','invoiced')]}"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_customer':1}" attrs="{'readonly': [('state','=','invoiced')]}"/> </group><group>
<button name="action_invoice" string="Invoice" icon="gtk-apply" type="object" states="paid" attrs="{'readonly': [('partner_id','=',False)]}"/> <field name="name"/>
<field name="date_order"/>
</group>
</group> </group>
<notebook colspan="4"> <notebook>
<page string="Sale Order"> <page string="Sale Order">
<field name="lines" colspan="4" nolabel="1"> <field name="lines">
<tree string="Order lines" editable="bottom"> <tree string="Order lines" editable="bottom">
<field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)"/> <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)"/>
<field name="qty" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/> <field name="qty" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
@ -43,59 +47,59 @@
<field name="price_subtotal_incl"/> <field name="price_subtotal_incl"/>
</tree> </tree>
<form string="Order lines"> <form string="Order lines">
<field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)"/> <group col="4">
<field name="qty" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/> <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)"/>
<field name="discount" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/> <field name="qty" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
<field name="price_unit" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/> <field name="discount" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
<field name="price_subtotal" invisible="1"/> <field name="price_unit" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
<field name="price_subtotal_incl" invisible="1"/> <field name="price_subtotal" invisible="1"/>
<field name="notice"/> <field name="price_subtotal_incl" invisible="1"/>
<field name="notice"/>
</group>
</form> </form>
</field> </field>
<group colspan="4" col="7"> <div class="oe_form_subtotal_footer">
<field name="amount_tax"/> <field name="amount_tax"/>
<field name="amount_total"/> <field name="amount_total"/>
<button name="button_dummy" string="Update" icon="gtk-execute" states="draft" /> <button name="button_dummy" string="Update" icon="gtk-execute" states="draft" />
<button name="%(action_pos_discount)d" string="Discount" icon="gtk-remove" type="action" states="draft" /> </div>
</group>
</page> </page>
<page string="Payment"> <page string="Payment">
<field name="statement_ids" colspan="4" nolabel="1"> <field name="statement_ids">
<tree editable="bottom" string="Statement lines"> <tree editable="bottom" string="Statement lines">
<field name="journal_id"/> <field name="journal_id"/>
<field name="statement_id" /> <field name="statement_id" />
<field name="amount"/> <field name="amount"/>
</tree> </tree>
<form string="Statement lines"> <form string="Statement lines">
<field name="account_id"/> <group col="4">
<field name="amount"/> <field name="account_id"/>
<field name="statement_id" domain="[('company_id','=',parent.company_id),('state','=','open')]"/> <field name="amount"/>
<field name="statement_id" domain="[('company_id','=',parent.company_id),('state','=','open')]"/>
</group>
</form> </form>
</field> </field>
</page> </page>
<page string="Extra Info"> <page string="Extra Info">
<group colspan="2" col="2"> <group string="General Information">
<separator string="General Information" colspan="2"/>
<field name="company_id" groups="base.group_multi_company"/> <field name="company_id" groups="base.group_multi_company"/>
<field name="shop_id" widget="selection"/> <field name="shop_id" widget="selection"/>
<field name="user_id"/> <field name="user_id"/>
<field name="pricelist_id" groups="product.group_sale_pricelist" domain="[('type','=','sale')]"/> <field name="pricelist_id" groups="product.group_sale_pricelist" domain="[('type','=','sale')]"/>
<field name="picking_id" readonly="1"/> <field name="picking_id" readonly="1"/>
</group> </group>
<group colspan="2" col="3"> <group string="Accounting Information">
<separator string="Accounting Information" colspan="3"/>
<field name="sale_journal" domain="[('type','=','sale')]"/> <field name="sale_journal" domain="[('type','=','sale')]"/>
<button name="done" string="Post Entries" icon="gtk-apply" type="workflow" states="paid"/> <field name="invoice_id" readonly="1"
<field name="invoice_id" colspan="2" readonly="1"
attrs="{'invisible':[('state','&lt;&gt;','invoiced')]}"/> attrs="{'invisible':[('state','&lt;&gt;','invoiced')]}"/>
<button name="%(pos_invoice_report)d" string="Re-Print" <button name="%(pos_invoice_report)d" string="Re-Print"
icon="gtk-print" type="action" attrs="{'invisible':[('state','&lt;&gt;','invoiced')]}"/> icon="gtk-print" type="action" attrs="{'invisible':[('state','&lt;&gt;','invoiced')]}"/>
<field name="account_move" colspan="3" readonly="1" <field name="account_move" readonly="1"
attrs="{'invisible':[('state','&lt;&gt;','done')]}"/> attrs="{'invisible':[('state','&lt;&gt;','done')]}"/>
</group> </group>
</page> </page>
<page string="Notes" > <page string="Notes" >
<field colspan="4" name="note" nolabel="1"/> <field name="note"/>
</page> </page>
</notebook> </notebook>
</sheet> </sheet>
@ -201,11 +205,13 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="POS Order line"> <form string="POS Order line">
<field name="product_id" /> <group col="4">
<field name="qty" /> <field name="product_id" />
<field name="discount" /> <field name="qty" />
<field name="price_unit" /> <field name="discount" />
<field name="create_date" /> <field name="price_unit" />
<field name="create_date" />
</group>
</form> </form>
</field> </field>
</record> </record>
@ -248,13 +254,15 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="POS "> <form string="POS ">
<field name="user_id"/> <group col="4">
<field name="journal_id"/> <field name="user_id"/>
<field name="jl_id"/> <field name="journal_id"/>
<field name="date_create" widget="date"/> <field name="jl_id"/>
<field name="no_trans"/> <field name="date_create" widget="date"/>
<field name="amount"/> <field name="no_trans"/>
<field name="invoice_id"/> <field name="amount"/>
<field name="invoice_id"/>
<group>
</form> </form>
</field> </field>
</record> </record>
@ -339,10 +347,12 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="POS "> <form string="POS ">
<field name="date_order" widget="date"/> <grouop col="4">
<field name="qty"/> <field name="date_order" widget="date"/>
<field name="amount"/> <field name="qty"/>
<field name="user_id"/> <field name="amount"/>
<field name="user_id"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -405,10 +415,12 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="POS "> <form string="POS ">
<field name="date_order" widget="date"/> <group col="4">
<field name="qty"/> <field name="date_order" widget="date"/>
<field name="amount"/> <field name="qty"/>
<field name="user_id"/> <field name="amount"/>
<field name="user_id"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -471,12 +483,14 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="POS "> <form string="POS ">
<field name="user_id"/> <group col="4">
<field name="product_name"/> <field name="user_id"/>
<field name="date_order" widget="date"/> <field name="product_name"/>
<field name="qty"/> <field name="date_order" widget="date"/>
<field name="net_margin_per_qty"/> <field name="qty"/>
<field name="total"/> <field name="net_margin_per_qty"/>
<field name="total"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -538,12 +552,14 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="POS "> <form string="POS ">
<field name="user_id"/> <group col="4">
<field name="product_name"/> <field name="user_id"/>
<field name="date_order" widget="date"/> <field name="product_name"/>
<field name="qty"/> <field name="date_order" widget="date"/>
<field name="net_margin_per_qty"/> <field name="qty"/>
<field name="total"/> <field name="net_margin_per_qty"/>
<field name="total"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -606,8 +622,7 @@
<field name="inherit_id" ref="product.product_normal_form_view"/> <field name="inherit_id" ref="product.product_normal_form_view"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<group name="status" position="after"> <group name="status" position="after">
<group colspan="2" col="2" name="pos"> <group name="pos" string="Point of Sale">
<separator string="Point of Sale" colspan="2"/>
<field name="pos_categ_id"/> <field name="pos_categ_id"/>
</group> </group>
</group> </group>
@ -636,7 +651,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="PoS Categories"> <form string="PoS Categories">
<group colspan="4" col="6"> <group col="4">
<field name="name"/> <field name="name"/>
<field name="parent_id"/> <field name="parent_id"/>
<field name="sequence"/> <field name="sequence"/>
@ -770,8 +785,8 @@
<field name="domain">[('origin','like','POS')]</field> <field name="domain">[('origin','like','POS')]</field>
</record> </record>
<menuitem name="Reporting" id="menu_point_of_sale_reporting" parent="menu_point_root" sequence="20" /> <menuitem name="Reporting" id="menu_point_of_sale_reporting" parent="menu_point_root" sequence="20" />
<menuitem icon="STOCK_PRINT" action="action_report_pos_details" <menuitem icon="STOCK_PRINT" action="action_report_pos_details"
id="menu_pos_details" parent="menu_point_of_sale_reporting" sequence="6" /> id="menu_pos_details" parent="menu_point_of_sale_reporting" sequence="6" />

24
addons/point_of_sale/wizard/pos_box_entries.xml
View File

@ -9,19 +9,17 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Put Money"> <form string="Put Money">
<separator string="Fill in this form if you put money in the cash register:" colspan="4"/> <header>
<field name="name"/> <button name="get_in" string="Put Money" type="object" icon="gtk-apply" />
<field name="product_id"/> <button icon="gtk-stop" special="cancel" string="Cancel" />
<field name="journal_id"/> </header>
<field name="amount"/> <separator string="Fill in this form if you put money in the cash register:"/>
<separator colspan="4"/> <group col="4">
<group colspan="4" col="4"> <field name="name"/>
<group col="2" colspan="2"/> <field name="product_id"/>
<button icon="gtk-stop" special="cancel" <field name="journal_id"/>
string="Cancel" /> <field name="amount"/>
<button name="get_in" string="Put Money" </group>
colspan="1" type="object" icon="gtk-apply" />
</group>
</form> </form>
</field> </field>
</record> </record>

15
addons/point_of_sale/wizard/pos_box_out.xml
View File

@ -9,19 +9,16 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Output Operation"> <form string="Output Operation">
<separator string="Describe why you take money from the cash register:" colspan="4"/> <header>
<button name="get_out" string="Take Money" type="object" icon="gtk-apply" />
<button icon="gtk-stop" special="cancel" string="Cancel" />
</header>
<group col="4" string="Describe why you take money from the cash register:">
<field name="name"/> <field name="name"/>
<field name="product_id"/> <field name="product_id"/>
<field name="journal_id"/> <field name="journal_id"/>
<field name="amount"/> <field name="amount"/>
<separator colspan="4"/> </group>
<group colspan="4" col="4">
<group col="2" colspan="2"/>
<button icon="gtk-stop" special="cancel"
string="Cancel" />
<button name="get_out" string="Take Money"
colspan="1" type="object" icon="gtk-apply" />
</group>
</form> </form>
</field> </field>
</record> </record>

14
addons/point_of_sale/wizard/pos_close_statement.xml
View File

@ -9,18 +9,16 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Close Cash Registers"> <form string="Close Cash Registers">
<separator colspan="4" string="Do you want to close your cash registers?"/> <header>
<label string="OpenERP will close all cash registers he can close automatically without validation. He will also open all cash registers for which you have to control the ending balance before closing manually."/> <button name="close_statement" string="Yes"
<separator colspan="4"/> type="object" icon="gtk-ok"/>
<group col="4" colspan="4">
<group col="2" colspan="2"/>
<button icon='gtk-stop' special="cancel" <button icon='gtk-stop' special="cancel"
string="No" invisible="context.get('cancel_action')"/> string="No" invisible="context.get('cancel_action')"/>
<button icon='gtk-stop' type="object" name="cancel_wizard" <button icon='gtk-stop' type="object" name="cancel_wizard"
string="No" invisible="not context.get('cancel_action')"/> string="No" invisible="not context.get('cancel_action')"/>
<button name="close_statement" string="Yes" </header>
type="object" icon="gtk-ok"/> <separator string="Do you want to close your cash registers?"/>
</group> <label string="OpenERP will close all cash registers he can close automatically without validation. He will also open all cash registers for which you have to control the ending balance before closing manually."/>
</form> </form>
</field> </field>
</record> </record>

18
addons/point_of_sale/wizard/pos_confirm.xml
View File

@ -8,18 +8,12 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Post All Orders"> <form string="Post All Orders">
<separator string="Generate Journal Entries" colspan="4"/> <header>
<label string="Generate all sale journal entries for non invoiced orders linked to a closed cash register or statement." colspan="4" align="0.0"/> <button name="action_confirm" string="Generate Entries" type="object" icon="gtk-ok"/>
<newline/> <button icon='gtk-cancel' special="cancel" string="Cancel" />
<separator colspan="4"/> </header>
<group colspan="4" col="4"> <separator string="Generate Journal Entries"/>
<group colspan="2" col="2"> <label string="Generate all sale journal entries for non invoiced orders linked to a closed cash register or statement."/>
<button icon='gtk-cancel' special="cancel"
string="Cancel" />
<button name="action_confirm" string="Generate Entries"
colspan="1" type="object" icon="gtk-ok"/>
</group>
</group>
</form> </form>
</field> </field>
</record> </record>

22
addons/point_of_sale/wizard/pos_details.xml
View File

@ -3,27 +3,23 @@
<data> <data>
<!-- pos.details --> <!-- pos.details -->
<record id="view_pos_details" model="ir.ui.view"> <record id="view_pos_details" model="ir.ui.view">
<field name="name">POS Details</field> <field name="name">POS Details</field>
<field name="model">pos.details</field> <field name="model">pos.details</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="POS Details"> <form string="POS Details">
<group col="4" colspan="4"> <header>
<separator string="Dates" colspan="4"/>
<field name="date_start"/>
<field name="date_end"/>
<separator string="User" colspan="4"/>
<field name="user_ids" nolabel="1" colspan="4"/>
<separator string="" colspan="4"/>
<label string="" colspan="2"/>
<group colspan="2" col="2">
<button icon='gtk-cancel' special="cancel" <button icon='gtk-cancel' special="cancel"
string="Close" /> string="Close" />
<button name="print_report" string="Print Report" <button name="print_report" string="Print Report"
colspan="1" type="object" icon="gtk-print" /> colspan="1" type="object" icon="gtk-print" />
</group> </header>
<group col="4" string="Dates">
<field name="date_start"/>
<field name="date_end"/>
</group> </group>
<field name="user_ids"/>
</form> </form>
</field> </field>
</record> </record>
@ -39,5 +35,5 @@
</record> </record>
</data> </data>
</openerp> </openerp>

12
addons/point_of_sale/wizard/pos_discount.xml
View File

@ -9,13 +9,11 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Apply Discount"> <form string="Apply Discount">
<field name="discount" colspan="4"/> <header>
<separator colspan="4" string=""/> <button icon='gtk-cancel' special="cancel" string="Close" />
<group colspan="2"/> <button name="apply_discount" string="Apply Discount" type="object" icon="gtk-ok" />
<button icon='gtk-cancel' special="cancel" </header>
string="Close" /> <field name="discount"/>
<button name="apply_discount" string="Apply Discount"
colspan="1" type="object" icon="gtk-ok" />
</form> </form>
</field> </field>
</record> </record>

12
addons/point_of_sale/wizard/pos_open_statement.xml
View File

@ -9,15 +9,13 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Open Statements"> <form string="Open Statements">
<separator colspan="4" string="Do you want to open cash registers?"/> <header>
<label string="The system will open all cash registers, so that you can start recording payments. We suggest you to control the opening balance of each register, using their CashBox tab." colspan="4" align="0.0"/>
<separator colspan="4"/>
<group col="4" colspan="4">
<group col="2" colspan="2"/>
<button icon='gtk-stop' special="cancel" string="Cancel"/>
<button name="open_statement" string="Open Registers" <button name="open_statement" string="Open Registers"
type="object" icon="gtk-ok"/> type="object" icon="gtk-ok"/>
</group> <button icon='gtk-stop' special="cancel" string="Cancel"/>
</header>
<separator string="Do you want to open cash registers?"/>
<label string="The system will open all cash registers, so that you can start recording payments. We suggest you to control the opening balance of each register, using their CashBox tab."/>
</form> </form>
</field> </field>
</record> </record>

21
addons/point_of_sale/wizard/pos_payment.xml
View File

@ -8,19 +8,14 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Add payment :"> <form string="Add payment :">
<group colspan="4" col="4" > <header>
<group colspan="4"> <button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-apply"/>
<field name="journal"/> <button icon="gtk-stop" special="cancel" string="Cancel"/>
<field name="amount" /> </header>
<field name="payment_name"/> <group col="4">
</group> <field name="journal"/>
<newline/> <field name="amount" />
<separator colspan="4"/> <field name="payment_name"/>
<group colspan="2"/>
<group colspan="2">
<button icon="gtk-stop" special="cancel" string="Cancel"/>
<button name="check" string="Make Payment" colspan="1" type="object" icon="gtk-apply"/>
</group>
</group> </group>
</form> </form>
</field> </field>

14
addons/point_of_sale/wizard/pos_payment_report.xml
View File

@ -3,18 +3,14 @@
<data> <data>
<!-- pos.details --> <!-- pos.details -->
<record id="view_pos_payment_report" model="ir.ui.view"> <record id="view_pos_payment_report" model="ir.ui.view">
<field name="name">Payment Report</field> <field name="name">Payment Report</field>
<field name="model">pos.payment.report</field> <field name="model">pos.payment.report</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Payment Report"> <form string="Payment Report">
<group col="2" colspan="4"> <button name="print_report" string="Print Report" type="object" icon="gtk-print" />
<button icon='gtk-cancel' special="cancel" <button icon='gtk-cancel' special="cancel" string="Close" />
string="Close" />
<button name="print_report" string="Print Report"
colspan="1" type="object" icon="gtk-print" />
</group>
</form> </form>
</field> </field>
</record> </record>
@ -29,5 +25,5 @@
</record> </record>
</data> </data>
</openerp> </openerp>

16
addons/point_of_sale/wizard/pos_payment_report_user.xml
View File

@ -3,18 +3,16 @@
<data> <data>
<!-- pos.details --> <!-- pos.details -->
<record id="view_pos_payment_report" model="ir.ui.view"> <record id="view_pos_payment_report" model="ir.ui.view">
<field name="name">Pyament Report</field> <field name="name">Pyament Report</field>
<field name="model">pos.payment.report</field> <field name="model">pos.payment.report</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Pyament Report "> <form string="Pyament Report ">
<group col="2" colspan="4"> <header>
<button icon='gtk-cancel' special="cancel" <button name="print_report" string="Print Report" type="object" icon="gtk-print" />
string="Close" /> <button icon='gtk-cancel' special="cancel" string="Close" />
<button name="print_report" string="Print Report" </header>
colspan="1" type="object" icon="gtk-print" />
</group>
</form> </form>
</field> </field>
</record> </record>
@ -29,5 +27,5 @@
<field name="target">new</field> <field name="target">new</field>
</record> </record>
</data> </data>
</openerp> </openerp>

34
addons/point_of_sale/wizard/pos_payment_report_user_view.xml
View File

@ -1,20 +1,22 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<record id="pos_payment_report_user_form" model="ir.ui.view"> <record id="pos_payment_report_user_form" model="ir.ui.view">
<field name="name">pos.payment.report.user.form</field> <field name="name">pos.payment.report.user.form</field>
<field name="model">pos.payment.report.user</field> <field name="model">pos.payment.report.user</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Sale by User"> <form string="Sale by User">
<group col="2" colspan="4"> <header>
<field name="user_id"/> <button name="print_report" string="Print Report" colspan="1" type="object" icon="gtk-print" />
<button icon='gtk-cancel' special="cancel" string="Close" /> <button icon='gtk-cancel' special="cancel" string="Close" />
<button name="print_report" string="Print Report" colspan="1" type="object" icon="gtk-print" /> </header>
</group > <group>
</form> <field name="user_id"/>
</field> </group>
</record> </form>
</field>
</record>
<record id="action_report_pos_payment_report_user" model="ir.actions.act_window"> <record id="action_report_pos_payment_report_user" model="ir.actions.act_window">
<field name="name">Sales lines by Users</field> <field name="name">Sales lines by Users</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
@ -23,5 +25,5 @@
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="target">new</field> <field name="target">new</field>
</record> </record>
</data> </data>
</openerp> </openerp>

28
addons/point_of_sale/wizard/pos_receipt_view.xml
View File

@ -4,20 +4,20 @@
<!-- Pos Receipt --> <!-- Pos Receipt -->
<record id="view_pos_receipt" model="ir.ui.view"> <record id="view_pos_receipt" model="ir.ui.view">
<field name="name">Receipt</field> <field name="name">Receipt</field>
<field name="model">pos.receipt</field> <field name="model">pos.receipt</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Receipt :"> <form string="Receipt :">
<separator string="Print the Receipt of the Sale" colspan="4"/> <header>
<button icon='gtk-cancel' special="cancel" <button icon='gtk-cancel' special="cancel" string="Cancel" />
string="Cancel" /> <button name="print_report" string="Print Receipt" type="object" icon="gtk-print" />
<button name="print_report" string="Print Receipt" </header>
colspan="1" type="object" icon="gtk-print" /> <label string="Print the Receipt of the Sale"/>
</form> </form>
</field> </field>
</record> </record>
<record id="action_report_pos_receipt" model="ir.actions.act_window"> <record id="action_report_pos_receipt" model="ir.actions.act_window">

10
addons/point_of_sale/wizard/pos_return_view.xml
View File

@ -7,8 +7,8 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Return lines"> <form string="Return lines">
<button icon='gtk-cancel' special="cancel" string="Cancel" />
<button icon='gtk-ok' name= "create_returns" string="Return Products" type="object"/> <button icon='gtk-ok' name= "create_returns" string="Return Products" type="object"/>
<button icon='gtk-cancel' special="cancel" string="Cancel" />
</form> </form>
</field> </field>
</record> </record>
@ -40,9 +40,11 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form> <form>
<field name="product_id" /> <group col="4">
<field name="quantity" /> <field name="product_id" />
<field name="line_id" invisible="1"/> <field name="quantity" />
<field name="line_id" invisible="1"/>
</group>
</form> </form>
</field> </field>
</record> </record>

26
addons/point_of_sale/wizard/pos_sales_user.xml
View File

@ -3,21 +3,23 @@
<data> <data>
<!-- pos sales user --> <!-- pos sales user -->
<record id="view_pos_sale_user" model="ir.ui.view"> <record id="view_pos_sale_user" model="ir.ui.view">
<field name="name">Sale By User</field> <field name="name">Sale By User</field>
<field name="model">pos.sale.user</field> <field name="model">pos.sale.user</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Sale By User"> <form string="Sale By User">
<group col="2" colspan="4"> <header>
<field name="date_start"/> <button icon='gtk-cancel' special="cancel"
<field name="date_end"/> string="Close" />
<field name="user_id"/> <button name="print_report" string="Print Report"
<button icon='gtk-cancel' special="cancel" type="object" icon="gtk-ok" />
string="Close" /> </header>
<button name="print_report" string="Print Report" <group col="4">
colspan="1" type="object" icon="gtk-ok" /> <field name="date_start"/>
</group> <field name="date_end"/>
<field name="user_id"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -32,5 +34,5 @@
<field name="target">new</field> <field name="target">new</field>
</record> </record>
</data> </data>
</openerp> </openerp>

26
addons/portal/wizard/portal_wizard_view.xml
View File

@ -17,21 +17,17 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Add Portal Access"> <form string="Add Portal Access">
<field name="portal_id" widget="selection"/> <header>
<newline/> <button string="Cancel" special="cancel" icon="gtk-cancel"/>
<notebook colspan="4"> <button string="Send Invitations"
<page string="Users"> name="action_create" type="object" icon="gtk-ok"/>
<field name="user_ids" nolabel="1" colspan="4"/> </header>
</page> <group col="4">
<page string="Invitation message"> <field name="portal_id" widget="selection"/>
<label string="The following text will be included in the welcome email sent to users."/> </group>
<field name="message" nolabel="1" colspan="4"/> <field name="user_ids"/>
</page> <label string="The following text will be included in the welcome email sent to users."/>
</notebook> <field name="message"/>
<label colspan="2"/>
<button string="Cancel" special="cancel" icon="gtk-cancel"/>
<button string="Send Invitations"
name="action_create" type="object" icon="gtk-ok"/>
</form> </form>
</field> </field>
</record> </record>

185
addons/process/process_view.xml
View File

@ -14,7 +14,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Process"> <form string="Process">
<group colspan="4" col="6"> <group col="4">
<field name="name"/> <field name="name"/>
<field name="model_id"/> <field name="model_id"/>
<field name="active"/> <field name="active"/>
@ -37,46 +37,46 @@
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="Properties"> <page string="Properties">
<group colspan="4" col="6"> <group colspan="4" col="6">
<field name="model_id" select="1"/> <field name="model_id" select="1"/>
<field name="menu_id"/> <field name="menu_id"/>
<field name="help_url" widget="url"/> <field name="help_url" widget="url"/>
</group> </group>
<separator string="Conditions" colspan="4"/> <separator string="Conditions" colspan="4"/>
<field name="model_states"/> <field name="model_states"/>
<field name="condition_ids" nolabel="1" colspan="4"> <field name="condition_ids" nolabel="1" colspan="4">
<tree string="Other Conditions" editable="top"> <tree string="Other Conditions" editable="top">
<field name="name"/> <field name="name"/>
<field name="model_id"/> <field name="model_id"/>
<field name="model_states"/> <field name="model_states"/>
</tree> </tree>
</field> </field>
</page> </page>
<page string="Transitions"> <page string="Transitions">
<group colspan="4" col="4"> <group colspan="4" col="4">
<group colspan="2" col="2"> <group colspan="2" col="2">
<field name="transition_in" nolabel="1" height="400"> <field name="transition_in" nolabel="1" height="400">
<tree string="Incoming Transitions"> <tree string="Incoming Transitions">
<field name="name"/> <field name="name"/>
<field name="source_node_id"/> <field name="source_node_id"/>
</tree> </tree>
</field> </field>
</group> </group>
<group colspan="2" col="2"> <group colspan="2" col="2">
<field name="transition_out" nolabel="1" height="400"> <field name="transition_out" nolabel="1" height="400">
<tree string="Outgoing Transitions"> <tree string="Outgoing Transitions">
<field name="name"/> <field name="name"/>
<field name="target_node_id"/> <field name="target_node_id"/>
</tree> </tree>
</field> </field>
</group> </group>
</group> </group>
</page> </page>
<page string="Notes"> <page string="Notes">
<field name="note" nolabel="1" colspan="4"/> <field name="note" nolabel="1" colspan="4"/>
</page> </page>
</notebook> </notebook>
</form> </form>
</field> </field>
</page> </page>
@ -159,49 +159,41 @@
<field name="flow_start"/> <field name="flow_start"/>
<field name="kind" select="1"/> <field name="kind" select="1"/>
<field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/> <field name="subflow_id" attrs="{'invisible':[('kind','!=','subflow')]}"/>
</group> </group>
<notebook colspan="4"> <notebook>
<page string="Properties"> <page string="Properties">
<group colspan="4" col="6"> <group col="4">
<field name="model_id" select="1"/> <field name="model_id"/>
<field name="menu_id"/> <field name="menu_id"/>
<field name="help_url" widget="url"/> <field name="help_url" widget="url"/>
</group> <field name="model_states"/>
<separator string="Conditions" colspan="4"/> </group>
<field name="model_states"/> <field name="condition_ids">
<field name="condition_ids" nolabel="1" colspan="4"> <tree string="Other Conditions" editable="bottom">
<tree string="Other Conditions" editable="top"> <field name="name"/>
<field name="name"/> <field name="model_id"/>
<field name="model_id"/> <field name="model_states"/>
<field name="model_states"/> </tree>
</tree> </field>
</field> </page>
</page> <page string="Transitions">
<page string="Transitions"> <field name="transition_in" nolabel="1" height="400">
<group colspan="4" col="4"> <tree string="Incoming Transitions">
<group colspan="2" col="2"> <field name="name"/>
<field name="transition_in" nolabel="1" height="400"> <field name="source_node_id"/>
<tree string="Incoming Transitions"> </tree>
<field name="name"/> </field>
<field name="source_node_id"/> <field name="transition_out" nolabel="1" height="400">
</tree> <tree string="Outgoing Transitions">
</field> <field name="name"/>
</group> <field name="target_node_id"/>
<group colspan="2" col="2"> </tree>
<field name="transition_out" nolabel="1" height="400"> </field>
<tree string="Outgoing Transitions"> </page>
<field name="name"/> <page string="Notes">
<field name="target_node_id"/> <field name="note"/>
</tree> </page>
</field> </notebook>
</group>
</group>
</page>
<page string="Notes">
<field name="note" nolabel="1" colspan="4"/>
</page>
</notebook>
</form> </form>
</field> </field>
</record> </record>
@ -260,35 +252,36 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Process Transition"> <form string="Process Transition">
<group col="6" colspan="4"> <group col="4">
<field name="name" select="1"/> <field name="name"/>
<field name="source_node_id" select="1"/> <field name="source_node_id"/>
<field name="target_node_id" select="1"/> <field name="target_node_id"/>
</group> </group>
<notebook colspan="4"> <notebook>
<page string="Actions"> <page string="Actions">
<field name="action_ids" nolabel="1" colspan="4"> <field name="action_ids">
<tree string="Actions"> <tree string="Actions">
<field name="name"/> <field name="name"/>
<field name="state"/> <field name="state"/>
<field name="action"/> <field name="action"/>
</tree> </tree>
<form string="Actions"> <form string="Actions">
<field name="name" colspan="4"/> <group col="4">
<newline/> <field name="name" colspan="4"/>
<field name="state"/> <field name="state"/>
<field name="action"/> <field name="action"/>
</group>
</form> </form>
</field> </field>
</page> </page>
<page string="Workflow Transitions"> <page string="Workflow Transitions">
<field name="transition_ids" colspan="4" nolabel="1"/> <field name="transition_ids"/>
</page> </page>
<page string="Associated Groups"> <page string="Associated Groups">
<field name="group_ids" colspan="4" nolabel="1"/> <field name="group_ids"/>
</page> </page>
<page string="Notes"> <page string="Notes">
<field name="note" nolabel="1" colspan="4"/> <field name="note"/>
</page> </page>
</notebook> </notebook>
</form> </form>

66
addons/procurement/procurement_view.xml
View File

@ -46,7 +46,7 @@
<field name="model">procurement.order</field> <field name="model">procurement.order</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="Procurement">
<header> <header>
<button name="button_confirm" states="draft" string="Confirm"/> <button name="button_confirm" states="draft" string="Confirm"/>
<button name="button_check" states="confirmed" string="Run Procurement"/> <button name="button_check" states="confirmed" string="Run Procurement"/>
@ -54,48 +54,48 @@
<button name="button_cancel" states="draft,exception,waiting" string="Cancel"/> <button name="button_cancel" states="draft,exception,waiting" string="Cancel"/>
<field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" /> <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" />
</header> </header>
<sheet string="Procurement" layout="auto"> <sheet>
<group col="2" colspan="2" class="oe_form_header"> <group>
<separator colspan="2" string="References"/> <group string="References">
<field name="name" string="Procurement Reason"/> <field name="name"/>
<field name="origin"/> <field name="origin"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<group string="Planification">
<field name="date_planned"/>
<field name="procure_method"/>
<field name="priority"/>
</group>
</group> </group>
<group col="2" colspan="2"> <notebook>
<separator colspan="2" string="Planification"/>
<field name="date_planned"/>
<field name="procure_method"/>
<field name="priority"/>
</group>
<notebook colspan="4">
<page string="Procurement Details"> <page string="Procurement Details">
<separator colspan="4" string="Product &amp; Location"/> <group string="Product &amp; Location" col="4">
<field name="product_id" on_change="onchange_product_id(product_id)"/> <field name="product_id" on_change="onchange_product_id(product_id)"/>
<field name="location_id" domain="[('usage','=','internal')]"/> <field name="location_id" domain="[('usage','=','internal')]"/>
<field name="product_qty"/> <field name="product_qty"/>
<field name="product_uom"/> <field name="product_uom"/>
<field name="product_uos_qty" groups="product.group_uos"/> <field name="product_uos_qty" groups="product.group_uos"/>
<field name="product_uos" groups="product.group_uos"/> <field name="product_uos" groups="product.group_uos"/>
</group>
<separator colspan="4" string="Status"/> <separator string="Status"/>
<field colspan="4" name="message" readonly="1"/> <field name="message"/>
</page> </page>
<page string="Extra Information"> <page string="Extra Information">
<separator colspan="4" string="Details"/> <group string="Details" col="4">
<field name="move_id"/> <field name="move_id"/>
<field name="date_close"/> <field name="date_close"/>
<field name="close_move"/> <field name="close_move"/>
</group>
</page> </page>
<page string="Notes"> <page string="Notes">
<separator colspan="4" string="Note" /> <field name="note"/>
<field name="note" colspan="4" nolabel="1"/>
</page> </page>
</notebook> </notebook>
</sheet> </sheet>
<div class="oe_form_sheet_width"> <footer>
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/> <field name="message_ids" widget="ThreadView"/>
</div> </footer>
</form> </form>
</field> </field>
</record> </record>

23
addons/procurement/wizard/make_procurement_view.xml
View File

@ -10,19 +10,16 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Procurement Request"> <form string="Procurement Request">
<label string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders." colspan="4"/> <header>
<field name="product_id" on_change="onchange_product_id(product_id)"/> <button name="make_procurement" string="Ask New Products" type="object" icon="gtk-ok" />
<field name="qty"/> <button icon='gtk-cancel' special="cancel" string="Cancel" />
<field name="uom_id"/> </header>
<field name="date_planned"/> <group col="4" string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders.">
<field name="warehouse_id" colspan="4"/> <field name="product_id" on_change="onchange_product_id(product_id)"/>
<newline/> <field name="qty"/>
<separator colspan="4"/> <field name="uom_id"/>
<group col="2" colspan="4"> <field name="date_planned"/>
<button icon='gtk-cancel' special="cancel" <field name="warehouse_id"/>
string="Cancel" />
<button name="make_procurement" string="Ask New Products"
colspan="1" type="object" icon="gtk-ok" />
</group> </group>
</form> </form>
</field> </field>

12
addons/procurement/wizard/mrp_procurement_view.xml
View File

@ -10,14 +10,12 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Parameters"> <form string="Parameters">
<label string="This wizard will schedule procurements." colspan="4" align="0.0"/> <header>
<newline/>
<group col="2" colspan="4">
<button icon='gtk-cancel' special="cancel"
string="Cancel" />
<button name="procure_calculation" string="Compute Procurements" <button name="procure_calculation" string="Compute Procurements"
colspan="1" type="object" icon="gtk-ok" /> type="object" icon="gtk-ok" />
</group> <button icon='gtk-cancel' special="cancel" string="Cancel" />
</header>
<label string="This wizard will schedule procurements."/>
</form> </form>
</field> </field>
</record> </record>

32
addons/procurement/wizard/orderpoint_procurement_view.xml
View File

@ -4,33 +4,31 @@
<!-- Compute Stock Minimum Rules Only --> <!-- Compute Stock Minimum Rules Only -->
<record id="view_procurement_compute_wizard" model="ir.ui.view"> <record id="view_procurement_compute_wizard" model="ir.ui.view">
<field name="name">Compute Stock Minimum Rules Only</field> <field name="name">Compute Stock Minimum Rules Only</field>
<field name="model">procurement.orderpoint.compute</field> <field name="model">procurement.orderpoint.compute</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Parameters"> <form string="Parameters">
<label string="Wizard checks all the stock minimum rules and generate procurement order." colspan="4"/> <header>
<separator colspan="4"/> <button name="procure_calculation" string="Compute Stock" type="object" icon="gtk-ok" />
<field name="automatic"/> <button icon='gtk-cancel' special="cancel" string="Cancel" />
<separator colspan="4"/> </header>
<group col="2" colspan="4"> <label string="Wizard checks all the stock minimum rules and generate procurement order."/>
<button icon='gtk-cancel' special="cancel" <group col="2">
string="Cancel" /> <field name="automatic"/>
<button name="procure_calculation" string="Compute Stock" </group>
colspan="1" type="object" icon="gtk-ok" />
</group>
</form> </form>
</field> </field>
</record> </record>
<act_window name="Compute Stock Minimum Rules Only" <act_window name="Compute Stock Minimum Rules Only"
res_model="procurement.orderpoint.compute" res_model="procurement.orderpoint.compute"
src_model="procurement.order" src_model="procurement.order"
view_mode="form" view_mode="form"
target="new" target="new"
key2="client_action_multi" key2="client_action_multi"
id="action_procurement_compute"/> id="action_procurement_compute"/>
</data> </data>
</openerp> </openerp>

33
addons/procurement/wizard/schedulers_all_view.xml
View File

@ -4,33 +4,30 @@
<!-- Compute Schedulers --> <!-- Compute Schedulers -->
<record id="view_compute_schedulers_wizard" model="ir.ui.view"> <record id="view_compute_schedulers_wizard" model="ir.ui.view">
<field name="name">Compute Schedulers</field> <field name="name">Compute Schedulers</field>
<field name="model">procurement.order.compute.all</field> <field name="model">procurement.order.compute.all</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Scheduler Parameters"> <form string="Scheduler Parameters">
<label string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing." colspan="4"/> <header>
<separator colspan="4"/> <button name="procure_calculation" string="Compute Schedulers" type="object" icon="gtk-ok" />
<field name="automatic"/> <button icon='gtk-cancel' special="cancel" string="Cancel" />
<separator colspan="4"/> </header>
<group col="2" colspan="4"> <group string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing."/>
<button icon='gtk-cancel' special="cancel" <field name="automatic"/>
string="Cancel" /> </group>
<button name="procure_calculation" string="Compute Schedulers"
colspan="1" type="object" icon="gtk-ok" />
</group>
</form> </form>
</field> </field>
</record> </record>
<act_window name="Compute Schedulers" <act_window name="Compute Schedulers"
res_model="procurement.order.compute.all" res_model="procurement.order.compute.all"
src_model="procurement.order" src_model="procurement.order"
view_mode="form" view_mode="form"
target="new" target="new"
key2="client_action_multi" key2="client_action_multi"
id="action_compute_schedulers"/> id="action_compute_schedulers"/>
</data> </data>
</openerp> </openerp>

197
addons/product/product_view.xml
View File

@ -69,130 +69,118 @@
<field eval="7" name="priority"/> <field eval="7" name="priority"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Product" layout="auto"> <form string="Product" layout="auto">
<group colspan="4" col="8"> <field name="product_image" widget='image' class="oe_form_avatar oe_right"/>
<group colspan="4" col="2"> <label for="name" class="oe_form_readonly_hidden"/>
<separator string="Name" colspan="2"/> <h1><field name="name"/></h1>
<field name="name"/> <label for="categ_id" class="oe_form_readonly_hidden"/>
<field groups="product.group_product_variant" name="variants" /> <h2><field name="categ_id"/></h2>
</group>
<group colspan="1" col="2"> <notebook>
<separator string="Codes" colspan="2"/>
<field name="default_code"/>
<field name="ean13" placeholder="5901234123457" />
</group>
<group colspan="1" col="2">
<separator string="Characteristics" colspan="2"/>
<field name="sale_ok"/>
<field name="purchase_ok"/>
</group>
<group colspan="1" col="1">
<field name="product_image" widget='image' nolabel="1"/>
</group>
</group>
<notebook colspan="4">
<page string="Information"> <page string="Information">
<group colspan="2" col="2"> <group>
<separator string="Procurement" colspan="2"/> <group>
<field name="type"/> <field name="default_code"/>
<field name="procure_method"/> <field name="ean13" placeholder="5901234123457" />
<field name="supply_method"/> <field groups="product.group_product_variant" name="variants" />
</group> </group>
<group colspan="2" col="2"> <group>
<separator string="Base Prices" colspan="2"/> <field name="sale_ok"/>
<field name="list_price"/> <field name="purchase_ok"/>
<field name="cost_method"/> </group>
<field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/> <group string="Procurement">
<newline/> <field name="type"/>
<field name="price_margin" groups="product.group_product_variant"/> <field name="procure_method"/>
<field name="price_extra" groups="product.group_product_variant"/> <field name="supply_method"/>
</group> </group>
<group string="Base Prices">
<field name="list_price"/>
<field name="cost_method"/>
<field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
<field name="price_margin" groups="product.group_product_variant"/>
<field name="price_extra" groups="product.group_product_variant"/>
</group>
<group colspan="2" col="2" groups="product.group_stock_packaging"> <group groups="product.group_stock_packaging" string="Weights">
<separator string="Weights" colspan="2"/> <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
<field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/> <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
<field name="weight" attrs="{'readonly':[('type','=','service')]}"/> <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
<field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/> </group>
</group>
<group colspan="2" col="2" name="status"> <group name="status" string="Status">
<separator string="Status" colspan="2"/> <field name="state"/>
<field name="categ_id"/> <field name="product_manager"/>
<field name="state"/> </group>
<field name="product_manager"/>
</group>
<group colspan="2" col="2" name="uom" groups="product.group_uom"> <group name="uom" groups="product.group_uom" string="Unit of Measure">
<separator string="Unit of Measure" colspan="2"/> <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
<field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/> <field name="uom_po_id"/>
<field name="uom_po_id"/> </group>
</group>
<group colspan="2" col="2" name="uos" groups="product.group_uos"> <group name="uos" groups="product.group_uos" string="Second Unit of Measure">
<separator string="Second Unit of Measure" colspan="2"/> <field name="uos_id"/>
<field name="uos_id"/> <field name="uos_coeff"/>
<field name="uos_coeff"/> <field name="mes_type"/>
<field name="mes_type"/> </group>
</group> </group>
</page> </page>
<page string="Procurement &amp; Locations"> <page string="Procurement &amp; Locations">
<group colspan="2" col="2" name="delay"> <group>
<separator string="Delays" colspan="2"/> <group name="delay" string="Delays">
<field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/> <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
<field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/> <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
<field name="warranty"/> <field name="warranty"/>
</group> </group>
<group colspan="2" col="2" name="store"> <group name="store" string="Storage Localisation">
<separator string="Storage Localisation" colspan="2"/> <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}" />
<field name="loc_rack" attrs="{'readonly':[('type','=','service')]}" /> <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
<field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/> <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
<field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/> </group>
</group> <group name="misc" string="Miscellaneous">
<field name="active"/>
<group colspan="2" col="2" name="misc"> <field name="company_id" groups="base.group_multi_company" widget="selection"/>
<separator string="Miscellaneous" colspan="2"/> </group>
<field name="active"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group> </group>
</page> </page>
<page string="Suppliers"> <page string="Suppliers">
<field colspan="4" name="seller_ids" nolabel="1" context="{'uom_id': uom_id}"/> <field name="seller_ids" context="{'uom_id': uom_id}"/>
</page> </page>
<page string="Descriptions"> <page string="Descriptions">
<separator string="Description"/> <separator string="Description"/>
<field colspan="4" name="description" nolabel="1"/> <field name="description"/>
<separator string="Sale Description"/> <separator string="Sale Description"/>
<field colspan="4" name="description_sale" nolabel="1" placeholder="This note will be displayed on quotations..."/> <field name="description_sale" placeholder="This note will be displayed on quotations..."/>
<separator string="Purchase Description"/> <separator string="Purchase Description"/>
<field colspan="4" name="description_purchase" nolabel="1" placeholder="This note will be displayed on requests for quotation..."/> <field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
</page> </page>
<page groups="product.group_stock_packaging" string="Packaging"> <page groups="product.group_stock_packaging" string="Packaging">
<field colspan="4" name="packaging" nolabel="1"> <field name="packaging">
<form string="Packaging"> <form string="Packaging">
<field name="ean"/> <group col="4">
<field name="sequence" invisible="1"/> <field name="ean"/>
<newline/> <field name="sequence" invisible="1"/>
<field name="qty"/> <newline/>
<field name="ul"/> <field name="qty"/>
<field name="weight_ul"/> <field name="ul"/>
<separator colspan="4" string="Palletization"/> <field name="weight_ul"/>
<field name="ul_qty"/> <separator colspan="4" string="Palletization"/>
<field name="rows"/> <field name="ul_qty"/>
<field name="weight"/> <field name="rows"/>
<separator colspan="4" string="Pallet Dimension"/> <field name="weight"/>
<field name="height"/> <separator colspan="4" string="Pallet Dimension"/>
<field name="width"/> <field name="height"/>
<field name="length"/> <field name="width"/>
<field name="length"/>
</group>
<separator colspan="4" string="Description"/> <separator colspan="4" string="Description"/>
<field colspan="4" name="name" nolabel="1"/> <field name="name"/>
</form> </form>
</field> </field>
</page> </page>
</notebook> </notebook>
<div class="oe_form_sheet_width"> <footer>
<field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/> <field name="message_ids" widget="ThreadView"/>
</div> </footer>
</form> </form>
</field> </field>
</record> </record>
@ -317,11 +305,12 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Product Categories"> <form string="Product Categories">
<field name="name"/> <group col="4">
<field name="parent_id"/> <field name="name"/>
<field name="sequence" invisible="1"/> <field name="parent_id"/>
<field name="type"/> <field name="sequence" invisible="1"/>
<newline/> <field name="type"/>
</group>
</form> </form>
</field> </field>
</record> </record>