<openerp>
-<data>
- <record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
- <field name="name">sale_journal.invoice.type.form</field>
- <field name="model">sale_journal.invoice.type</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Invoice Type">
- <field name="name" select="1"/>
- <field name="active" select="1"/>
- <field name="invoicing_method" select="1"/>
- <newline/>
- <field name="note" colspan="4"/>
- </form>
- </field>
- </record>
- <record model="ir.ui.view" id="view_sale_journal_invoice_type_tree">
- <field name="name">sale_journal.invoice.type.tree</field>
- <field name="model">sale_journal.invoice.type</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string="Invoice Type">
- <field name="name"/>
- <field name="invoicing_method"/>
- </tree>
- </field>
- </record>
- <record model="ir.actions.act_window" id="action_definition_journal_invoice_type">
- <field name="res_model">sale_journal.invoice.type</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- </record>
-
-<!-- <menuitem name="Invoicing Methods" id="menu_definition_journal_invoice_type" parent="sale.menu_shop_configuration" action="action_definition_journal_invoice_type"/>-->
-
- <record model="ir.ui.view" id="view_sale_journal_form">
- <field name="name">sale_journal.sale.journal.form</field>
- <field name="model">sale_journal.sale.journal</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Sale Journal">
- <notebook>
- <page string="Journal">
- <separator string="Journal Information" colspan="4"/>
- <field name="name" select="1"/>
- <field name="code" select="1"/>
- <field name="user_id" select="1"/>
- <field name="date" select="1"/>
- <field name="date_created" select="1"/>
- <field name="date_validation" select="1"/>
- <separator string="States" colspan="4"/>
- <field name="state"/>
- <group col="3" colspan="2">
- <button name="button_open" string="Open Journal" states="draft" type="object" icon="gtk-open"/>
- <button name="button_close" string="Close Journal" states="open" type="object" icon="gtk-close"/>
- <button name="button_draft" string="Set to Draft" states="close,open" type="object" icon="gtk-convert"/>
+ <data>
+ <!-- sale journal invoice Type's Form view -->
+
+ <record model="ir.ui.view" id="view_sale_journal_invoice_type_form">
+ <field name="name">sale_journal.invoice.type.form</field>
+ <field name="model">sale_journal.invoice.type</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Invoice Type">
+ <group colspan="4" col="6">
+ <field name="name" select="1"/>
+ <field name="invoicing_method" select="1"/>
+ <field name="active" select="1"/>
</group>
- </page>
- <page string="Sales">
- <button string="Confirm Sales" name="button_sale_confirm" states="draft,open" type="object" icon="gtk-execute"/>
- <button string="Cancel Sales" name="button_sale_cancel" states="draft,open" type="object" icon="gtk-cancel"/>
- <newline/>
- <field name="sale_stats_ids" colspan="4" nolabel="1">
- <tree string="Sales">
- <field name="name"/>
- <field name="quantity"/>
- <field name="price_total"/>
- <field name="price_average"/>
- <field name="count"/>
- <field name="state"/>
- </tree>
- </field>
- </page><page string="Notes">
+ <separator string="Notes" colspan="4"/>
<field name="note" colspan="4" nolabel="1"/>
- </page>
- </notebook>
- </form>
- </field>
- </record>
- <record model="ir.ui.view" id="view_sale_journal_tree">
- <field name="name">sale_journal.sale.journal.tree</field>
- <field name="model">sale_journal.sale.journal</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string="Sale Journal">
- <field name="name" select="1"/>
- <field name="code" select="1"/>
- <field name="user_id" select="1"/>
- <field name="date" select="1"/>
- <field name="state"/>
- </tree>
- </field>
- </record>
-
- <record model="ir.ui.view" id="view_sale_journal_search">
- <field name="name">sale_journal.sale.journal.search</field>
- <field name="model">sale_journal.sale.journal</field>
- <field name="type">search</field>
- <field name="arch" type="xml">
- <search string="Sales by Journal">
- <group col="8" colspan="4">
- <filter icon="terp-sale" string="My Sale Journals" domain="[('user_id','=',uid)]" help="My Sale Journals"/>
- <filter icon="terp-sale" string="Open" domain="[('state','=','open')]" help="Open Sale Journals"/>
- <separator orientation="vertical"/>
- <field name="name" select="1"/>
- <field name="code" select="1"/>
- <field name="user_id" select="1"/>
- <field name="date" select="1"/>
- </group>
- </search>
- </field>
- </record>
-
- <record model="ir.actions.act_window" id="action_definition_journal">
- <field name="res_model">sale_journal.sale.journal</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="search_view_id" ref="view_sale_journal_search"/>
- </record>
-
-<!-- <menuitem name="Sales Journals" id="menu_definition_journal" parent="sale.menu_shop_configuration" action="action_definition_journal"/>-->
- <menuitem id="menu_sale_journal" name="Journal" parent="base.menu_base_config" sequence="60" />
- <menuitem name="Sales Journals" id="menu_definition_journal" parent="menu_sale_journal" action="action_definition_journal"/>
-
- <record model="ir.ui.view" id="sale_journal_sale_order">
- <field name="name">sale.order.journal.view.form</field>
- <field name="type">form</field>
- <field name="model">sale.order</field>
- <field name="inherit_id" ref="sale.view_order_form" />
- <field name="arch" type="xml">
- <field name="invoiced" position="after">
- <field name="journal_id" select="1"/>
- <field name="invoice_type_id" select="1"/>
+ </form>
</field>
- </field>
- </record>
- <record model="ir.ui.view" id="sale_journal_sale_order_tree">
- <field name="name">sale.order.journal.view.tree</field>
- <field name="type">tree</field>
- <field name="model">sale.order</field>
- <field name="inherit_id" ref="sale.view_order_tree" />
- <field name="arch" type="xml">
- <field name="state" position="after">
- <field name="invoice_type_id"/>
- <field name="journal_id"/>
+ </record>
+
+ <!-- sale journal invoice Type's tree view -->
+
+ <record model="ir.ui.view" id="view_sale_journal_invoice_type_tree">
+ <field name="name">sale_journal.invoice.type.tree</field>
+ <field name="model">sale_journal.invoice.type</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree string="Invoice Type">
+ <field name="name"/>
+ <field name="invoicing_method"/>
+ </tree>
</field>
- </field>
- </record>
-
- <record model="ir.ui.view" id="sale_journal_picking_order">
- <field name="name">stock.picking.journal.view.form</field>
- <field name="type">form</field>
- <field name="model">stock.picking</field>
- <field name="inherit_id" ref="stock.view_picking_form" />
- <field name="arch" type="xml">
- <field name="origin" position="after">
- <field name="journal_id" select="1"/>
- <field name="sale_journal_id" select="1"/>
- <field name="invoice_type_id" select="1"/>
+ </record>
+
+ <!-- Action for sale journal invoice Type -->
+
+ <record model="ir.actions.act_window" id="action_definition_journal_invoice_type">
+ <field name="name">Invoice Types</field>
+ <field name="res_model">sale_journal.invoice.type</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="help">Invoice types are used for partners, sales orders and delivery orders. You can create a specific invoicing journal to group your invoicing according to your customer's needs: daily, each Wednesday, monthly, etc.</field>
+ </record>
+
+ <menuitem id="menu_definition_journal_invoice_type"
+ parent="base.menu_sale_config_sales" action="action_definition_journal_invoice_type"/>
+
+ <!-- Inherit sales order form view -->
+
+ <record model="ir.ui.view" id="sale_journal_sale_order">
+ <field name="name">sale.order.journal.view.form</field>
+ <field name="type">form</field>
+ <field name="model">sale.order</field>
+ <field name="inherit_id" ref="sale.view_order_form" />
+ <field name="arch" type="xml">
+ <field name="origin" position="after">
+ <field name="invoice_type_id" widget="selection"/>
+ </field>
</field>
- </field>
- </record>
-
- <record model="ir.ui.view" id="sale_journal_picking_order_tree">
- <field name="name">stock.picking.journal.view.tree</field>
- <field name="type">tree</field>
- <field name="model">stock.picking</field>
- <field name="inherit_id" ref="stock.vpicktree" />
- <field name="arch" type="xml">
- <field name="invoice_state" position="after">
- <field name="journal_id" select="1"/>
- <field name="invoice_type_id" select="1"/>
- <field name="sale_journal_id" select="1"/>
+ </record>
+
+ <!-- Inherit sales order tree view-->
+
+ <record model="ir.ui.view" id="sale_journal_sale_order_tree">
+ <field name="name">sale.order.journal.view.tree</field>
+ <field name="type">tree</field>
+ <field name="model">sale.order</field>
+ <field name="inherit_id" ref="sale.view_order_tree" />
+ <field name="arch" type="xml">
+ <field name="state" position="after">
+ <field name="invoice_type_id" widget="selection"/>
+ </field>
</field>
- </field>
- </record>
-
- <record model="ir.ui.view" id="sale_journal_picking_order_del">
- <field name="name">stock.picking.journal.view.form</field>
- <field name="type">form</field>
- <field name="model">stock.picking</field>
- <field name="inherit_id" ref="stock.view_picking_delivery_form" />
- <field name="arch" type="xml">
- <field name="origin" position="after">
- <field name="journal_id" select="1"/>
- <field name="sale_journal_id" select="1"/>
- <field name="invoice_type_id" select="1"/>
+ </record>
+
+<!-- Inherit stock picking's form view -->
+
+ <record model="ir.ui.view" id="sale_journal_picking_order">
+ <field name="name">stock.picking.journal.view.form</field>
+ <field name="type">form</field>
+ <field name="model">stock.picking</field>
+ <field name="inherit_id" ref="stock.view_picking_form" />
+ <field name="arch" type="xml">
+ <field name="origin" position="after">
+ <field name="invoice_type_id" widget="selection"/>
+ </field>
</field>
- </field>
- </record>
-
- <record model="ir.ui.view" id="sale_journal_picking_order_tree_del">
- <field name="name">stock.picking.journal.view.tree</field>
- <field name="type">tree</field>
- <field name="model">stock.picking</field>
- <field name="inherit_id" ref="stock.view_picking_delivery_tree" />
- <field name="arch" type="xml">
- <field name="origin" position="after">
- <field name="journal_id" select="1"/>
- <field name="invoice_type_id" select="1"/>
- <field name="sale_journal_id" select="1"/>
+ </record>
+
+<!-- Inherit stock picking's tree view -->
+
+ <record model="ir.ui.view" id="sale_journal_picking_order_tree">
+ <field name="name">stock.picking.journal.view.tree</field>
+ <field name="type">tree</field>
+ <field name="model">stock.picking</field>
+ <field name="inherit_id" ref="stock.vpicktree" />
+ <field name="arch" type="xml">
+ <field name="origin" position="after">
+ <field name="invoice_type_id" select="1"/>
+ </field>
</field>
- </field>
- </record>
-
-
- <record model="ir.ui.view" id="sale_journal_picking_order_in">
- <field name="name">stock.picking.journal.view.form</field>
- <field name="type">form</field>
- <field name="model">stock.picking</field>
- <field name="inherit_id" ref="stock.view_picking_in_form" />
- <field name="arch" type="xml">
- <field name="origin" position="after">
- <field name="journal_id" select="1"/>
- <field name="sale_journal_id" select="1"/>
- <field name="invoice_type_id" select="1"/>
+ </record>
+
+ <record model="ir.ui.view" id="sale_journal_picking_order_in">
+ <field name="name">stock.picking.journal.view.form</field>
+ <field name="type">form</field>
+ <field name="model">stock.picking</field>
+ <field name="inherit_id" ref="stock.view_picking_in_form" />
+ <field name="arch" type="xml">
+ <field name="origin" position="after">
+ <field name="invoice_type_id" select="1"/>
+ </field>
</field>
- </field>
- </record>
-
- <record model="ir.ui.view" id="sale_journal_picking_order_tree_in">
- <field name="name">stock.picking.journal.view.tree</field>
- <field name="type">tree</field>
- <field name="model">stock.picking</field>
- <field name="inherit_id" ref="stock.view_picking_in_tree" />
- <field name="arch" type="xml">
- <field name="invoice_state" position="after">
- <field name="journal_id" select="1"/>
- <field name="invoice_type_id" select="1"/>
- <field name="sale_journal_id" select="1"/>
+ </record>
+
+ <record model="ir.ui.view" id="sale_journal_picking_order_tree_in">
+ <field name="name">stock.picking.journal.view.tree</field>
+ <field name="type">tree</field>
+ <field name="model">stock.picking</field>
+ <field name="inherit_id" ref="stock.view_picking_in_tree" />
+ <field name="arch" type="xml">
+ <field name="origin" position="after">
+ <field name="invoice_type_id" select="1"/>
+ </field>
</field>
- </field>
- </record>
-
-
- <record model="ir.ui.view" id="sale_journal_picking_order_out">
- <field name="name">stock.picking.journal.view.form</field>
- <field name="type">form</field>
- <field name="model">stock.picking</field>
- <field name="inherit_id" ref="stock.view_picking_out_form" />
- <field name="arch" type="xml">
- <field name="origin" position="after">
- <field name="journal_id" select="1"/>
- <field name="sale_journal_id" select="1"/>
- <field name="invoice_type_id" select="1"/>
+ </record>
+
+ <record model="ir.ui.view" id="sale_journal_picking_order_out">
+ <field name="name">stock.picking.journal.view.form</field>
+ <field name="type">form</field>
+ <field name="model">stock.picking</field>
+ <field name="inherit_id" ref="stock.view_picking_out_form" />
+ <field name="arch" type="xml">
+ <field name="origin" position="after">
+ <field name="invoice_type_id" select="1"/>
+ </field>
</field>
- </field>
- </record>
-
- <record model="ir.ui.view" id="sale_journal_picking_order_tree_out">
- <field name="name">stock.picking.journal.view.tree</field>
- <field name="type">tree</field>
- <field name="model">stock.picking</field>
- <field name="inherit_id" ref="stock.view_picking_out_tree" />
- <field name="arch" type="xml">
- <field name="invoice_state" position="after">
- <field name="journal_id" select="1"/>
- <field name="invoice_type_id" select="1"/>
- <field name="sale_journal_id" select="1"/>
+ </record>
+
+ <record model="ir.ui.view" id="sale_journal_picking_order_tree_out">
+ <field name="name">stock.picking.journal.view.tree</field>
+ <field name="type">tree</field>
+ <field name="model">stock.picking</field>
+ <field name="inherit_id" ref="stock.view_picking_out_tree" />
+ <field name="arch" type="xml">
+ <field name="origin" position="after">
+ <field name="invoice_type_id" select="1"/>
+ </field>
</field>
- </field>
- </record>
-
-
-
- <record model="ir.ui.view" id="view_sale_journal_sale_stats_tree">
- <field name="name">sale_journal.sale.stats.tree</field>
- <field name="model">sale_journal.sale.stats</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string="Sales by Journal">
- <field name="name"/>
- <field name="state"/>
- <field name="journal_id"/>
- <field name="quantity"/>
- <field name="count"/>
- <field name="price_total"/>
- <field name="price_average"/>
- </tree>
- </field>
- </record>
- <record model="ir.ui.view" id="view_sale_journal_sale_stats_form">
- <field name="name">sale_journal.sale.stats.form</field>
- <field name="model">sale_journal.sale.stats</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Sales by Journal">
- <field name="name" select="1"/>
- <field name="state" select="1"/>
- <field name="journal_id" select="1"/>
- <field name="quantity"/>
- <field name="count"/>
- <field name="price_total"/>
- <field name="price_average"/>
- </form>
- </field>
- </record>
-
- <record model="ir.ui.view" id="view_sale_journal_sale_stats_search">
- <field name="name">sale_journal.sale.stats.search</field>
- <field name="model">sale_journal.sale.stats</field>
- <field name="type">search</field>
- <field name="arch" type="xml">
- <search string="Sales by Journal">
- <group col="8" colspan="4">
- <filter icon="terp-sale" string="This Year" domain="[('name','!=','')]" help="Sale journal in this year"/>
- <filter icon="terp-sale" string="This Month" domain="[('name','=',time.strftime('%%Y-%%m-01'))]" help="Sale journal in this month"/>
- <separator orientation="vertical"/>
- <field name="name" select="1"/>
- <field name="state" select="1"/>
- <field name="journal_id" select="1"/>
- </group>
- </search>
- </field>
- </record>
-
- <record model="ir.actions.act_window" id="action_sale_sale_stats_open_menu_all">
- <field name="name">Sales by Journal</field>
- <field name="res_model">sale_journal.sale.stats</field>
- <field name="type">ir.actions.act_window</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="search_view_id" ref="view_sale_journal_sale_stats_search"/>
- </record>
-
- <menuitem name="Reporting" id="menu_definition_report_sales" parent="base.menu_base_partner" sequence="8"/>
- <menuitem name="Sales by Journal" id="menu_sale_sale_stats_open_all" parent="menu_definition_report_sales" action="action_sale_sale_stats_open_menu_all"/>
-
- <act_window name="Monthly sales"
- domain="[('journal_id', '=', active_id)]"
- res_model="sale_journal.sale.stats"
- src_model="sale_journal.sale.journal"
- id="act_sale_journal_sale_journal_2_sale_journal_sale_stats"/>
-
- <act_window name="Assigned picking"
- domain="[('journal_id', '=', active_id),('state', '=', 'assigned')]"
- res_model="stock.picking"
- src_model="sale_journal.picking.journal"
- id="act_sale_journal_picking_journal_2_stock_picking_assigned"/>
-
- <act_window name="Confirmed picking"
- domain="[('journal_id', '=', active_id),('state', '=', 'confirmed')]"
- res_model="stock.picking"
- src_model="sale_journal.picking.journal"
- id="act_sale_journal_picking_journal_2_stock_picking_confirmed"/>
-
- <act_window name="Assigned picking"
- domain="[('sale_journal_id', '=', active_id),('state', '=', 'assigned')]"
- res_model="stock.picking"
- src_model="sale_journal.sale.journal"
- id="act_sale_journal_sale_journal_2_stock_picking_assigned"/>
-
- <act_window name="Confirmed picking"
- domain="[('sale_journal_id', '=', active_id),('state', '=', 'confirmed')]"
- res_model="stock.picking"
- src_model="sale_journal.sale.journal"
- id="act_sale_journal_sale_journal_2_stock_picking_confirmed"/>
-
- <act_window name="Draft sales"
- domain="[('journal_id', '=', active_id),('state', '=', 'draft')]"
- res_model="sale.order"
- src_model="sale_journal.sale.journal"
- id="act_sale_journal_sale_journal_2_sale_order_draft"/>
-
- <act_window name="Approved sales"
- domain="[('journal_id', '=', active_id),('state', '=', 'approved')]"
- res_model="sale.order"
- src_model="sale_journal.sale.journal"
- id="act_sale_journal_sale_journal_2_sale_order_approved"/>
-
- <record id="view_partner_property_form" model="ir.ui.view">
- <field name="name">res.partner.journal.property.form.inherit</field>
- <field name="model">res.partner</field>
- <field name="type">form</field>
- <field name="inherit_id" ref="base.view_partner_form"/>
- <field name="arch" type="xml">
- <page string="Sales & Purchases" position="inside">
- <field name="property_invoice_type"/>
- </page>
- </field>
- </record>
-
+ </record>
+
+ <record id="view_partner_property_form" model="ir.ui.view">
+ <field name="name">res.partner.journal.property.form.inherit</field>
+ <field name="model">res.partner</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="base.view_partner_form"/>
+ <field name="arch" type="xml">
+ <page string="Sales & Purchases" position="inside">
+ <group colspan="2" col="2">
+ <separator string="Invoicing" colspan="2"/>
+ <field name="property_invoice_type" widget="selection"/>
+ </group>
+ </page>
+ </field>
+ </record>
-</data>
+ </data>
</openerp>