<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Vouchers">
- <group col='8' colspan='4'>
+ <group>
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
<filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
<separator orientation="vertical"/>
- <filter icon="terp-stock_effects-object-colorize" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
+ <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
<separator orientation="vertical"/>
<field name="date"/>
<field name="number"/>
<field name="partner_id" string="Supplier"/>
</group>
<newline/>
- <group col='8' colspan='4'>
+ <group>
<field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('purchase','purchase_refund'))]"/>
<field name="period_id" groups="base.group_extended"/>
</group>
- <newline/>
- <group expand="0" string="Extended options..." col='8' colspan='4'>
- <field name="reference"/>
- <field name="name"/>
- <field name="narration"/>
- <field name="amount"/>
- </group>
<newline/>
- <group expand="0" string="Group By..." colspan="4" col="10">
- <filter string="Supplier" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+ <group expand="0" string="Group By...">
+ <filter string="Supplier" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
<filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Vouchers">
- <group col='8' colspan='4'>
+ <group>
<filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Vouchers"/>
<filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
<separator orientation="vertical"/>
- <filter icon="terp-stock_effects-object-colorize" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
+ <filter icon="terp-gtk-jump-to-ltr" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
<separator orientation="vertical"/>
<field name="date"/>
<field name="number"/>
<field name="partner_id" string="Customer"/>
</group>
<newline/>
- <group col='8' colspan='4'>
+ <group>
<field name="journal_id" widget="selection" context="{'journal_id': self, 'set_visible':False}" domain="[('type','in',('sale','sale_refund'))]"/>
<field name="period_id" groups="base.group_extended"/>
</group>
- <newline/>
- <group expand="0" string="Extended options..." col='8' colspan='4'>
- <field name="reference"/>
- <field name="name"/>
- <field name="narration"/>
- <field name="amount"/>
- </group>
<newline/>
- <group expand="0" string="Group By..." colspan="4" col="10">
- <filter string="Customer" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+ <group expand="0" string="Group By...">
+ <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
<filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id','visible':True}"/>
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
</record>
<record id="act_pay_voucher" model="ir.actions.act_window">
- <field name="name">Sales Payment</field>
+ <field name="name">Customer Payment</field>
<field name="res_model">account.voucher</field>
<field name="view_type">form</field>
<field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt'), ('partner_id','=',partner_id)]</field>
<field name="context">{'type':'receipt', 'partner_id': partner_id, 'default_reference':reference}</field>
<field name="view_id" ref="view_vendor_receipt_form"/>
- <field name="target">new</field>
+ <field name="target">current</field>
</record>
<record model="ir.ui.view" id="view_sale_receipt_form">
<field name="arch" type="xml">
<form string="Sales Receipt">
<group col="6" colspan="4">
- <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)" string="Customer"/>
- <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id)"/>
+ <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
+ <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
+ <field name="journal_id" domain="[('type','in',['sale','sale_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_cr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
<field name="number"/>
- <field name="name" colspan="4"/>
- <field name="date" on_change="onchange_date(date)"/>
+ <field name="name" colspan="2"/>
+ <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
<field name="type" invisible="True"/>
- <field name="currency_id" invisible="True" nolabel="1"/>
+ <field name="currency_id"/>
</group>
<notebook colspan="4">
<page string="Sales Information">
- <field name="line_cr_ids" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" default_get="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
+ <field name="line_cr_ids" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
<tree string="Sales Lines" editable="bottom">
<field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection"/>
<field name="name"/>
<field name="amount" sum="Total"/>
- <field name="account_analytic_id" groups="base.group_extended"/>
+ <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
</tree>
</field>
<group col="2" colspan="3">
<group col="2" colspan="1">
<separator string="Payment Options" colspan="2"/>
<field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
- <field name="account_id"
+ <field name="account_id"
attrs="{'invisible':[('pay_now','!=','pay_now')]}"
domain="[('type','=','liquidity')]"/>
<!-- should select income accounts only. Or use the journal for this ? -->
attrs="{'invisible':[('pay_now','!=','pay_now')]}"
/>
<field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
+ <field name="paid" invisible="1"/>
</group>
<group col="4" colspan="1">
<separator string="Total" colspan="4"/>
- <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all'))]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" groups="base.group_extended" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
+ <field name="tax_id" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" groups="base.group_extended" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
<label string="" colspan="1"/><field name="amount" string="Total"/>
</group>
</group>
</page>
<page string="Journal Items" groups="base.group_extended" attrs="{'invisible': [('state','!=','posted')]}">
<group col="6" colspan="4">
- <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
<field name="period_id"/>
<field name="audit"/>
</group>
- <separator string="Journal Items" colspan="4"/>
- <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+ <field name="move_ids" colspan="4" nolabel="1" readonly="1">
+ <tree string="Journal Items">
+ <field name="move_id"/>
+ <field name="ref"/>
+ <field name="date"/>
+ <field name="statement_id"/>
+ <field name="partner_id"/>
+ <field name="account_id"/>
+ <field name="name"/>
+ <field name="debit"/>
+ <field name="credit"/>
+ <field name="state"/>
+ <field name="reconcile_id"/>
+ </tree>
+ </field>
</page>
</notebook>
- <group col="10" colspan="4">
- <field name="state"/>
+ <group col="8" colspan="4">
+ <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel"/>
<button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
- <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
- <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Sales Payment', 'type':'receipt', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/>
+ <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
+ <group attrs="{'invisible':['|', ('state','!=','posted'), ('paid','=',True)]}">
+ <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
+ </group>
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
</group>
</form>
</field>
</record>
-
+
<!-- Sales Voucher -->
<record id="action_sale_receipt" model="ir.actions.act_window">
<field name="name">Sales Receipt</field>
<field name="res_model">account.voucher</field>
<field name="view_type">form</field>
<field name="domain">[('journal_id.type','in',['sale','sale_refund']), ('type','=','sale')]</field>
- <field name="context">{'type':'sale'}</field>
+ <field name="context">{'default_type': 'sale', 'type': 'sale'}</field>
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_voucher_filter_sale"/>
<field name="target">current</field>
+ <field name="help">When you sell products to a customer, you can give him a sales receipt or an invoice. When the sales receipt is confirmed, it creates journal items automatically and you can record the customer payment related to this sales receipt.</field>
</record>
<record id="action_sale_receipt_tree" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<menuitem id="menu_action_sale_receipt" icon="STOCK_JUSTIFY_FILL"
action="action_sale_receipt"
parent="account.menu_finance_receivables"
+ groups="base.group_extended"
sequence="10"/>
<!-- Purchase Vouchers -->
<field name="res_model">account.voucher</field>
<field name="view_type">form</field>
<field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','payment'), ('partner_id','=',partner_id)]</field>
- <field name="context">{'type':'payment', 'partner_id': partner_id, 'default_reference':reference}</field>
+ <field name="context">{'default_type':'payment', 'type':'payment', 'default_partner_id': partner_id, 'partner_id': partner_id, 'default_reference':reference}</field>
<field name="view_id" ref="view_vendor_payment_form"/>
- <field name="target">new</field>
+ <field name="target">current</field>
</record>
<record model="ir.ui.view" id="view_purchase_receipt_form">
<field name="name">account.voucher.purchase.form</field>
<field name="model">account.voucher</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Vendor Bills">
+ <form string="Supplier Voucher">
<group col="6" colspan="4">
- <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Vendor" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type)"/>
- <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id)"/>
+ <field name="partner_id" domain="[('supplier','=',True)]" required="1" string="Supplier" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
+ <field name="date" string="Bill Date" select="1" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
+ <field name="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" select="1" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
<field name="number"/>
- <field name="name" colspan="4"/>
+ <field name="name" colspan="2"/>
<field name="reference" select="1"/>
+ <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
<field name="account_id" domain="[('type','=','other')]" invisible="True"/>
<field name="type" invisible="True"/>
- <field name="currency_id" invisible="True" nolabel="1"/>
+ <field name="currency_id"/>
</group>
<notebook colspan="4">
<page string="Bill Information">
- <field name="line_dr_ids" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" default_get="{'journal_id':journal_id,'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
+ <field name="line_dr_ids" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" context="{'journal_id':journal_id,'partner_id':partner_id}" colspan="4" nolabel="1" height="180">
<tree string="Expense Lines" editable="bottom">
<field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"/>
<field name="name"/>
<field name="amount"/>
- <field name="account_analytic_id" groups="base.group_extended"/>
+ <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
</tree>
</field>
<group col="2" colspan="3">
<group col="2" colspan="1">
<group col="2" colspan="1">
<separator string="Payment Terms" colspan="2"/>
- <field name="date" string="Bill Date" select="1" on_change="onchange_date(date)"/>
<field name="date_due"/>
+ <field name="paid" invisible="1"/>
</group>
<group col="4" colspan="1">
<separator string="Total" colspan="4"/>
- <field name="tax_id" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('purchase','all'))]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" groups="base.group_extended" attrs="{'invisible': [('state','!=','draft')]}"/>
+ <field name="tax_id" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" widget="selection" domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" groups="base.group_extended" attrs="{'invisible': [('state','!=','draft')]}"/>
<label string="" colspan="1"/><field name="amount" string="Total"/>
</group>
</group>
</page>
<page string="Journal Items" groups="base.group_extended" attrs="{'invisible': [('state','!=','posted')]}">
<group col="6" colspan="4">
- <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
<field name="period_id"/>
<field name="audit"/>
</group>
- <separator string="Journal Items" colspan="4"/>
- <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+ <field name="move_ids" colspan="4" nolabel="1" readonly="1">
+ <tree string="Journal Items">
+ <field name="move_id"/>
+ <field name="ref"/>
+ <field name="date"/>
+ <field name="statement_id"/>
+ <field name="partner_id"/>
+ <field name="account_id"/>
+ <field name="name"/>
+ <field name="debit"/>
+ <field name="credit"/>
+ <field name="state"/>
+ <field name="reconcile_id"/>
+ </tree>
+ </field>
</page>
</notebook>
<group col="10" colspan="4">
- <field name="state"/>
+ <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma" icon="gtk-cancel"/>
<button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
- <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
- <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':[('pay_now','!=','pay_now'), ('state','!=','posted')]}"/>
+ <group attrs="{'invisible':['|', ('state','!=','posted'), ('paid','=',True)]}">
+ <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
+ </group>
+ <field name="pay_now" invisible="1"/>
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+ <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
</group>
</form>
</field>
</record>
<record id="action_purchase_receipt" model="ir.actions.act_window">
- <field name="name">Vendor Bills</field>
+ <field name="name">Purchase Receipt</field>
<field name="res_model">account.voucher</field>
<field name="view_type">form</field>
<field name="domain">[('journal_id.type','in',['purchase','purchase_refund']), ('type','=','purchase')]</field>
- <field name="context">{'type':'purchase'}</field>
+ <field name="context">{'default_type': 'purchase', 'type': 'purchase'}</field>
<field name="view_id" eval="False"/>
<field name="search_view_id" eval="view_voucher_filter_vendor"/>
<field name="target">current</field>
<field name="act_window_id" ref="action_purchase_receipt"/>
</record>
- <menuitem id="menu_action_purchase_receipt" icon="STOCK_JUSTIFY_FILL"
- action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="10"/>
-
+ <menuitem id="menu_action_purchase_receipt" icon="STOCK_JUSTIFY_FILL"
+ action="action_purchase_receipt" parent="account.menu_finance_payables" sequence="10"
+ groups="base.group_extended"/>
+
</data>
</openerp>
projects / odoo / odoo.git / blobdiff