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

[MERGE]: Merged with lp:openobject-addons 

bzr revid: atp@tinyerp.com-20120612124829-npltu26uzi7atxtg
This commit is contained in:
Atul Patel (OpenERP) 2012-06-12 18:18:29 +05:30
parent 74ff1cc4b3 b871639070
commit 8984b9705b
589 changed files with 11514 additions and 137639 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/account/account.py
View File

@ -3031,6 +3031,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
return res return res
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
if context is None:context = {}
res = super(wizard_multi_charts_accounts, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False) res = super(wizard_multi_charts_accounts, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
cmp_select = [] cmp_select = []
acc_template_obj = self.pool.get('account.chart.template') acc_template_obj = self.pool.get('account.chart.template')

18
addons/account/account_installer.xml
View File

@ -10,20 +10,10 @@
<form position="attributes"> <form position="attributes">
<attribute name="string">Accounting Application Configuration</attribute> <attribute name="string">Accounting Application Configuration</attribute>
</form> </form>
<separator string="title" position="attributes">
<attribute name="string">Configure Your Chart of Accounts</attribute>
</separator>
<xpath expr="//label[@string='description']" position="attributes">
<attribute name="string">The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default.</attribute>
</xpath>
<xpath expr="//button[@string='Install Modules']" position="attributes"> <xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">Configure</attribute> <attribute name="string">Configure</attribute>
</xpath> </xpath>
<xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes"> <xpath expr="//separator[@string='title']" position="after">
<attribute name="rowspan">23</attribute>
<attribute name="string"/>
</xpath>
<group colspan="8" position="inside">
<group colspan="4" width="600"> <group colspan="4" width="600">
<field name="charts"/> <field name="charts"/>
<group colspan="4" groups="account.group_account_user"> <group colspan="4" groups="account.group_account_user">
@ -35,7 +25,11 @@
<field name="period" colspan="4"/> <field name="period" colspan="4"/>
</group> </group>
</group> </group>
</group> </xpath>
<separator string="title" position="attributes">
<attribute name="string">Configure Your Chart of Accounts</attribute>
<label string="The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default."/>
</separator>
</data> </data>
</field> </field>
</record> </record>

340
addons/account/account_invoice_view.xml
View File

@ -50,23 +50,25 @@
<field name="model">account.invoice.line</field> <field name="model">account.invoice.line</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Invoice Line"> <form string="Invoice Line" version="7.0">
<field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/> <group col="4">
<field colspan="2" name="name"/> <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
<label string="Quantity" for="quantity" align="1.0"/> <field name="name"/>
<group colspan="1" col="2"> <label string="Quantity" for="quantity" align="1.0"/>
<field name="quantity" nolabel="1"/> <div>
<field name="uos_id" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)" nolabel="1" groups="product.group_uom"/> <field name="quantity" class="oe_form_inline"/>
<field name="uos_id" class="oe_form_inline"
on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
</div>
<field name="price_unit"/>
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
<field name="discount"/>
<field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
</group> </group>
<field name="price_unit"/> <separator string="Notes"/>
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)" groups="account.group_account_user"/> <field name="note"/>
<field name="discount"/>
<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
<field name="company_id" groups="base.group_multi_company" readonly="1"/>
<separator string="Notes" colspan="4"/>
<field colspan="4" name="note" nolabel="1"/>
<separator colspan="4" string="Taxes"/>
<field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" nolabel="1"/>
</form> </form>
</field> </field>
</record> </record>
@ -92,20 +94,22 @@
<field name="model">account.invoice.tax</field> <field name="model">account.invoice.tax</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Manual Invoice Taxes"> <form string="Manual Invoice Taxes" version="7.0">
<field name="name"/> <group col="4">
<field name="sequence"/> <field name="name"/>
<field name="account_id"/> <field name="sequence"/>
<field name="manual"/> <field name="account_id"/>
<field name="amount"/> <field name="manual"/>
<field name="base" readonly="0"/> <field name="amount"/>
<separator colspan="4" string="Tax Codes"/> <field name="base" readonly="0"/>
<field name="base_code_id"/> <separator colspan="4" string="Tax Codes"/>
<field name="base_amount"/> <field name="base_code_id"/>
<field name="tax_code_id"/> <field name="base_amount"/>
<field name="tax_amount"/> <field name="tax_code_id"/>
<field name="factor_base" invisible="True"/> <field name="tax_amount"/>
<field name="factor_tax" invisible="True"/> <field name="factor_base" invisible="True"/>
<field name="factor_tax" invisible="True"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -142,39 +146,48 @@
<field name="type">form</field> <field name="type">form</field>
<field name="priority">2</field> <field name="priority">2</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form layout="manual"> <form version="7.0">
<header> <header>
<button name="invoice_open" states="draft,proforma2" string="Validate"/> <button name="invoice_open" states="draft,proforma2" string="Validate"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid'/> <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid'/>
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/> <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/> <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
<button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/> <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/> <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
</header> </header>
<sheet string="Supplier Invoice" layout="auto"> <sheet string="Supplier Invoice">
<group col="8" colspan="4" class="oe_form_header"> <group>
<field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"/> <group>
<field name="number" readonly="1" placeholder="PO0025"/> <field string="Supplier" name="partner_id"
<field name="type" invisible="1"/> on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
<field name="currency_id" width="50"/> context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
<button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/> domain="[('supplier', '=', True)]"/>
<newline/> <field name="fiscal_position" widget="selection"/>
<field string="Supplier" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" options='{"quick_create": false}' domain="[('supplier', '=', True)]"/> </group>
<field name="fiscal_position" widget="selection"/> <group>
<newline/> <field name="number"/>
<field name="date_invoice"/> <field name="date_invoice"/>
<field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" widget="selection"/> <field name="period_id" domain="[('state', '=', 'draft')]"
<group colspan="2" col="1" groups="account.group_account_user"> groups="account.group_account_user" widget="selection"/>
<label align="0.0" string="(keep empty to use the current period)"/> <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"
groups="account.group_account_user"/>
<field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
name="account_id" groups="account.group_account_user"/>
<field name="currency_id"/>
<field name="type" invisible="1"/>
</group>
<group>
<label for="reference"/>
<div>
<field name="reference_type"/>
<field name="reference" placeholder="Payment Reference"/>
</div>
<field name="date_due"/>
</group> </group>
</group> </group>
<notebook colspan="4"> <notebook>
<page string="Invoice"> <page string="Invoice">
<field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]" name="account_id" groups="account.group_account_user"/> <field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line">
<field name="reference_type" nolabel="1" size="0"/>
<field name="reference" nolabel="1" placeholder="Payment Reference"/>
<field name="date_due"/>
<field colspan="4" context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line" nolabel="1">
<tree string="Invoice lines"> <tree string="Invoice lines">
<field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/> <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)"/> <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)"/>
@ -188,46 +201,50 @@
<field invisible="True" name="uos_id"/> <field invisible="True" name="uos_id"/>
</tree> </tree>
</field> </field>
<group col="1" colspan="2"> <group>
<field name="tax_line" nolabel="1"> <div>
<tree editable="bottom" string="Taxes"> <field name="tax_line">
<field name="name"/> <tree editable="bottom" string="Taxes">
<field name="account_id" groups="account.group_account_invoice"/> <field name="name"/>
<field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/> <field name="account_id" groups="account.group_account_invoice"/>
<field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/> <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
<field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
<field invisible="True" name="base_amount"/> <field invisible="True" name="base_amount"/>
<field invisible="True" name="tax_amount"/> <field invisible="True" name="tax_amount"/>
<field name="factor_base" invisible="True"/> <field name="factor_base" invisible="True"/>
<field name="factor_tax" invisible="True"/> <field name="factor_tax" invisible="True"/>
</tree> </tree>
</field> </field>
</group> <button name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
<group col="4" colspan="2"> </div>
<button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/> <group class="oe_form_subtotal_footer">
<field name="amount_untaxed"/> <field name="amount_untaxed"/>
<label string="" colspan="2"/> <field name="amount_tax"/>
<field name="amount_tax"/> <field name="amount_total" class="oe_form_subtotal_footer_separator"/>
<field name="reconciled"/>
<field name="amount_total"/> <field name="residual" style="margin-top: 10px"/>
<field name="residual"/> <field name="reconciled" invisible="1"/>
</group>
</group> </group>
<label for="comment" string="Terms and Conditions"/>
<field name="comment"/>
</page> </page>
<page string="Other Info"> <page string="Other Info">
<field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/> <group col="4">
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/> <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
<newline/> <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
<field name="payment_term" widget="selection"/> <newline/>
<field name="name"/> <field name="payment_term" widget="selection"/>
<newline/> <field name="name"/>
<field name="origin" placeholder="PO0025"/> <newline/>
<field name="user_id"/> <field name="origin" placeholder="PO0025"/>
<field name="move_id" groups="account.group_account_user"/> <field name="user_id"/>
<separator colspan="4" string="Additional Information"/> <field name="move_id" groups="account.group_account_user"/>
<field colspan="4" name="comment" nolabel="1"/> </group>
</page> </page>
<page string="Payments"> <page string="Payments">
<field name="payment_ids" colspan="4" nolabel="1" > <field name="payment_ids">
<tree string="Payments"> <tree string="Payments">
<field name="date" string="Payment Date"/> <field name="date" string="Payment Date"/>
<field name="move_id"/> <field name="move_id"/>
@ -243,9 +260,9 @@
</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>
@ -255,10 +272,10 @@
<field name="model">account.invoice</field> <field name="model">account.invoice</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 version="7.0">
<header> <header>
<button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/> <button name="action_invoice_sent" type="object" string="Send by Email" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
<button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/> <button name="invoice_print" string="Print Invoice" type="object" states="open" attrs="{'invisible':['|',('sent','=',True), ('state', '=', 'draft')]}"/>
<button name="invoice_open" states="draft,proforma2" string="Validate"/> <button name="invoice_open" states="draft,proforma2" string="Validate"/>
<button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/> <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='paid'/> <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='paid'/>
@ -268,68 +285,99 @@
<!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/--> <!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/> <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
</header> </header>
<sheet string="Invoice" layout="auto"> <sheet string="Invoice">
<group colspan="4" col="8" class="oe_form_header"> <h1>
<field name="journal_id" groups="account.group_account_user" on_change="onchange_journal_id(journal_id, context)" widget="selection"/> <label string="Draft Invoice " attrs="{'invisible': [('state','not in',('draft',))]}"/>
<field name="number"/> <label string="Pro Forma Invoice " attrs="{'invisible': [('state','not in',('proforma','proforma2'))]}"/>
<label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/>
<field name="number" readonly="1" class="oe_form_inline"/>
</h1>
<label string="Concerns" for="name" class="oe_form_readonly_hidden"/>
<h2>
<field name="name" placeholder="Project XYZ"/>
</h2>
<field name="type" invisible="1"/> <field name="type" invisible="1"/>
<field name="currency_id" width="50" groups="base.group_multi_company"/> <group>
<button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/> <group>
<newline/>
<field string="Customer" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user" context="{'search_default_customer': 1}" options='{"quick_create": false}' domain="[('customer', '=', True)]"/> <field string="Customer" name="partner_id"
<field name="fiscal_position" widget="selection" options='{"quick_create": false}'/> on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
<newline/> groups="base.group_user" context="{'search_default_customer': 1}"
<field name="date_invoice"/> domain="[('customer', '=', True)]"/>
<field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" widget="selection"/> <field name="fiscal_position" widget="selection" options='{"quick_create": false}'/>
<field name="payment_term" widget="selection"/> <field name="payment_term" widget="selection"/>
<newline/>
<field domain="[('company_id', '=', company_id),('type','=', 'receivable')]" name="account_id" groups="account.group_account_user"/> </group>
<field name="name" placeholder="Project XYZ"/> <group>
<field name="sent"/>
<field name="date_invoice"/>
<field name="period_id" domain="[('state', '=', 'draft')]"
groups="account.group_account_user" widget="selection"/>
<field name="journal_id" groups="account.group_account_user"
on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
<field domain="[('company_id', '=', company_id),('type','=', 'receivable')]"
name="account_id" groups="account.group_account_user"/>
<label for="currency_id"/>
<div>
<field name="currency_id" class="oe_form_inline"/>
<button name="%(action_account_change_currency)d" type="action"
icon="terp-stock_effects-object-colorize"
attrs="{'invisible':[('state','!=','draft')]}"
groups="account.group_account_user"/>
</div>
</group>
</group> </group>
<field name="sent" invisible="1"/>
<notebook colspan="4"> <notebook colspan="4">
<page string="Invoice"> <page string="Invoice">
<field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}"/> <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}"/>
<group col="1" colspan="2"> <group>
<field name="tax_line" nolabel="1"> <div>
<tree editable="bottom" string="Taxes"> <field name="tax_line" nolabel="1">
<field name="name"/> <tree editable="bottom" string="Taxes">
<field name="account_id" groups="account.group_account_invoice"/> <field name="name"/>
<field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/> <field name="account_id" groups="account.group_account_invoice"/>
<field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/> <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
<field invisible="True" name="base_amount"/> <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
<field invisible="True" name="tax_amount"/> <field invisible="True" name="base_amount"/>
<field name="factor_base" invisible="True"/> <field invisible="True" name="tax_amount"/>
<field name="factor_tax" invisible="True"/> <field name="factor_base" invisible="True"/>
</tree> <field name="factor_tax" invisible="True"/>
</field> </tree>
</group> </field>
<group col="4" colspan="2"> <button name="button_reset_taxes" states="draft,proforma2" string="Compute Taxes"
<group colspan="2" col="1"> type="object" groups="account.group_account_user" icon="terp-stock_format-scientific"
<button name="button_reset_taxes" states="draft,proforma2" string="Compute Taxes" type="object" groups="base.group_user" icon="terp-stock_format-scientific" help="This action will erase taxes"/> help="This action will erase taxes"/>
</div>
<group class="oe_form_subtotal_footer">
<field name="amount_untaxed"/>
<field name="amount_tax"/>
<field name="amount_total" class="oe_form_subtotal_footer_separator"/>
<field name="residual" style="margin-top: 10px"/>
<field name="reconciled" invisible="1"/>
</group> </group>
<field name="amount_untaxed"/>
<label string="" colspan="2"/>
<field name="amount_tax"/>
<field name="reconciled" groups="base.group_no_one"/>
<field name="amount_total"/>
<field name="residual" groups="account.group_account_user"/>
</group> </group>
</page> </page>
<page string="Other Info"> <page string="Other Info">
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/> <group col="4">
<newline/> <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
<field name="date_due"/> <newline/>
<field name="user_id"/> <field name="date_due"/>
<newline/> <field name="user_id"/>
<field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/> <newline/>
<field name="origin" placeholder="SO0032"/> <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"/>
<field name="move_id" groups="account.group_account_user"/> <field name="origin" placeholder="SO0032"/>
<separator colspan="4" string="Additional Information"/> <field name="move_id" groups="account.group_account_user"/>
<field colspan="4" name="comment" nolabel="1"/> </group>
<separator string="Additional Information"/>
<field name="comment"/>
</page> </page>
<page string="Payments"> <page string="Payments">
<field name="payment_ids" colspan="4" nolabel="1"> <field name="payment_ids">
<tree string="Payments"> <tree string="Payments">
<field name="date"/> <field name="date"/>
<field name="move_id"/> <field name="move_id"/>
@ -345,9 +393,9 @@
</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" colspan="4" widget="ThreadView" nolabel="1"/>
</div> </footer>
</form> </form>
</field> </field>
</record> </record>

1159
addons/account/account_view.xml
View File

File diff suppressed because it is too large Load Diff

2
addons/account/board_account_view.xml
View File

@ -38,7 +38,7 @@
<field name="model">board.board</field> <field name="model">board.board</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Account Board" layout="manual"> <form string="Account Board" version="7.0">
<board style="2-1"> <board style="2-1">
<column> <column>
<action name="%(account.action_invoice_tree1)d" creatable="true" string="Draft Customer Invoices" domain="[('state','in',('draft','proforma2')), ('type','=','out_invoice')]"/> <action name="%(account.action_invoice_tree1)d" creatable="true" string="Draft Customer Invoices" domain="[('state','in',('draft','proforma2')), ('type','=','out_invoice')]"/>

8
addons/account/i18n/ja.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n" "Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-06-08 01:32+0000\n" "PO-Revision-Date: 2012-06-12 01:28+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n" "Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n" "Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n" "X-Launchpad-Export-Date: 2012-06-12 04:55+0000\n"
"X-Generator: Launchpad (build 15376)\n" "X-Generator: Launchpad (build 15389)\n"
#. module: account #. module: account
#: view:account.invoice.report:0 #: view:account.invoice.report:0
@ -5512,7 +5512,7 @@ msgstr "有効な最大値"
#. module: account #. module: account
#: view:account.journal:0 #: view:account.journal:0
msgid "Invoicing Data" msgid "Invoicing Data"
msgstr "請求日" msgstr "請求書データ"
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile

1
addons/account/installer.py
View File

@ -94,6 +94,7 @@ class account_installer(osv.osv_memory):
raise osv.except_osv(_('No unconfigured company !'), _("There are currently no company without chart of account. The wizard will therefore not be executed.")) raise osv.except_osv(_('No unconfigured company !'), _("There are currently no company without chart of account. The wizard will therefore not be executed."))
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
if context is None:context = {}
res = super(account_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False) res = super(account_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
cmp_select = [] cmp_select = []
# display in the widget selection only the companies that haven't been configured yet # display in the widget selection only the companies that haven't been configured yet

116
addons/account/partner_view.xml
View File

@ -8,14 +8,13 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Fiscal Position"> <form string="Fiscal Position">
<group colspan="4" col="6"> <group col="4">
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="active"/> <field name="active"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group> </group>
<separator string="Mapping" colspan="4"/> <separator string="Mapping"/>
<newline/> <field name="tax_ids" widget="one2many_list">
<field name="tax_ids" colspan="2" widget="one2many_list" nolabel="1">
<tree string="Tax Mapping" editable="bottom"> <tree string="Tax Mapping" editable="bottom">
<field name="tax_src_id" domain="[('parent_id','=',False)]"/> <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
<field name="tax_dest_id" domain="[('parent_id','=',False)]"/> <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
@ -25,7 +24,7 @@
<field name="tax_dest_id" domain="[('parent_id','=',False)]"/> <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
</form> </form>
</field> </field>
<field name="account_ids" colspan="2" widget="one2many_list" nolabel="1"> <field name="account_ids" widget="one2many_list">
<tree string="Account Mapping" editable="bottom"> <tree string="Account Mapping" editable="bottom">
<field name="account_src_id"/> <field name="account_src_id"/>
<field name="account_dest_id"/> <field name="account_dest_id"/>
@ -35,8 +34,8 @@
<field name="account_dest_id"/> <field name="account_dest_id"/>
</form> </form>
</field> </field>
<separator string="Notes" colspan="4"/> <separator string="Notes"/>
<field name="note" colspan="4" nolabel="1"/> <field name="note"/>
</form> </form>
</field> </field>
</record> </record>
@ -75,57 +74,58 @@
<field name="priority">2</field> <field name="priority">2</field>
<field name="inherit_id" ref="base.view_partner_form"/> <field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<page string="History" position="before"> <page string="History" position="before" version="7.0">
<page string="Accounting"> <page string="Accounting" col="4">
<group col="2" colspan="2"> <group col="4">
<separator string="Customer Accounting Properties" colspan="2"/> <group string="Customer Accounting Properties" col="4">
<field name="property_account_receivable" groups="account.group_account_invoice" /> <field name="property_account_receivable" groups="account.group_account_invoice" />
<field name="property_account_position" widget="selection"/> <field name="property_account_position" widget="selection"/>
<field name="property_payment_term" widget="selection"/> <field name="property_payment_term" widget="selection"/>
</group> </group>
<group col="2" colspan="2"> <group string="Supplier Accounting Properties" col="4">
<separator string="Supplier Accounting Properties" colspan="2"/> <field name="property_account_payable" groups="account.group_account_invoice"/>
<field name="property_account_payable" groups="account.group_account_invoice"/> </group>
</group> <group string="Customer Credit" col="4">
<group col="2" colspan="2"> <field name="credit"/>
<separator string="Customer Credit" colspan="2"/> <field name="credit_limit"/>
<field name="credit"/> </group>
<field name="credit_limit"/> <group string="Supplier Debit" col="4">
</group> <field name="debit"/>
<group col="2" colspan="2"> </group>
<separator string="Supplier Debit" colspan="2"/> <field name="bank_ids">
<field name="debit"/> <form string="Bank account" version="7.0">
</group> <field name="state"/>
<field colspan="4" name="bank_ids" nolabel="1"> <field name="acc_number"/>
<form string="Bank account"> <group>
<field name="state"/> <group name="owner" string="Bank Account Owner">
<newline/> <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field name="acc_number"/> <field name="owner_name"/>
<newline/> <label for="street" string="Address"/>
<group name="owner" colspan="2" col="2"> <div>
<separator colspan="4" string="Bank Account Owner"/> <field name="street" placeholder="Street..."/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/> <div>
<field name="owner_name"/> <field name="zip" class="oe_form_inline" placeholder="ZIP"/>
<field name="street"/> <field name="city" class="oe_form_inline" placeholder="City"/>
<field name="city"/> </div>
<field name="zip"/> <field name="state_id" placeholder="State"/>
<field name="state_id"/> <field name="country_id" placeholder="Country"/>
<field name="country_id"/> </div>
</group> </group>
<group name="bank" colspan="2" col="2"> <group name="bank" string="Information About the Bank">
<separator colspan="2" string="Information About the Bank"/> <field name="bank" on_change="onchange_bank_id(bank)"/>
<field name="bank" on_change="onchange_bank_id(bank)"/> <field name="bank_name"/>
<field name="bank_bic"/>
</group>
</group>
</form>
<tree string="Bank Details">
<field name="sequence" invisible="1"/>
<field name="acc_number"/>
<field name="bank_name"/> <field name="bank_name"/>
<field name="bank_bic"/> <field name="owner_name"/>
</group> </tree>
</form> </field>
<tree string="Bank Details"> </group>
<field name="sequence" invisible="1"/>
<field name="acc_number"/>
<field name="bank_name"/>
<field name="owner_name"/>
</tree>
</field>
</page> </page>
</page> </page>
</field> </field>

9
addons/account/product_view.xml
View File

@ -14,9 +14,9 @@
<separator string="Purchase Properties" colspan="2"/> <separator string="Purchase Properties" colspan="2"/>
<field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/> <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/>
<field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}"/> <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
</group> </group>
<newline/> <newline/>
<group colspan="2"> <group colspan="2">
<separator string="Sale Taxes" colspan="2"/> <separator string="Sale Taxes" colspan="2"/>
<separator string="Purchase Taxes" colspan="2"/> <separator string="Purchase Taxes" colspan="2"/>
<field name="taxes_id" nolabel="1" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}"/> <field name="taxes_id" nolabel="1" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}"/>
@ -55,8 +55,7 @@
<field name="inherit_id" ref="product.product_category_form_view"/> <field name="inherit_id" ref="product.product_category_form_view"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form position="inside"> <form position="inside">
<group col="2" colspan="2"> <group string="Accounting Properties">
<separator string="Accounting Properties" colspan="2"/>
<field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/> <field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/> <field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
</group> </group>

273
addons/account/project/project_view.xml
View File

@ -80,31 +80,35 @@
<field name="model">account.analytic.account</field> <field name="model">account.analytic.account</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="Analytic Account" version="7.0">
<sheet string="Analytic account" layout="auto"> <sheet>
<group colspan="4" col="6"> <group>
<field name="name" colspan="4"/> <group>
<field name="code"/> <field name="name" colspan="4"/>
<field name="parent_id" on_change="on_change_parent(parent_id)"/> <field name="parent_id" on_change="on_change_parent(parent_id)"/>
<field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/> <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
<field name="type" select="2"/> </group>
<group>
<field name="type"/>
<field name="code"/>
</group>
</group> </group>
<notebook colspan="4"> <notebook>
<page string="Account Data"> <page string="Account Data">
<group colspan="2" col="2"> <group>
<separator colspan="2" string="Contacts"/> <group string="Contacts">
<field name="partner_id"/> <field name="partner_id"/>
<field name="user_id"/> <field name="user_id"/>
</group> </group>
<group colspan="2" col="2" name="contract"> <group name="contract" string="Contract Data">
<separator colspan="2" string="Contract Data"/> <field name="date_start"/>
<field name="date_start"/> <field name="date"/>
<field name="date"/> <field name="quantity_max"/>
<field name="quantity_max"/> </group>
</group> </group>
</page> </page>
<page string="Description"> <page string="Description">
<field colspan="4" name="description" nolabel="1"/> <field name="description"/>
</page> </page>
</notebook> </notebook>
</sheet> </sheet>
@ -153,31 +157,38 @@
<field name="model">account.analytic.line</field> <field name="model">account.analytic.line</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Analytic Entry"> <form string="Analytic Entry" version="7.0">
<group colspan="4" col="6"> <group>
<field name="name"/> <group>
<field name="ref"/> <field name="name"/>
<field name="account_id"/> <field name="account_id"/>
<field name="journal_id"/> <field name="journal_id"/>
<field name="date"/> </group>
<field name="company_id" groups="base.group_multi_company"/> <group>
</group> <field name="date"/>
<group colspan="2" col="4"> <field name="ref"/>
<separator string="Amount" colspan="4"/> <field name="company_id" groups="base.group_multi_company"/>
<field name="amount" colspan="4"/> </group>
<field name="amount_currency" colspan="2"/> <group string="Amount">
<field name="currency_id" colspan="2" nolabel="1"/> <field name="amount"/>
</group> <label for="amount_currency"/>
<group colspan="2" col="4"> <div>
<separator string="Product Information" colspan="4"/> <field name="amount_currency" class="oe_form_inline"/>
<field name="product_id" colspan="4"/> <field name="currency_id" class="oe_form_inline"/>
<field name="unit_amount" colspan="2"/> </div>
<field name="product_uom_id" colspan="2" nolabel="1"/> </group>
</group> <group string="Product Information">
<group colspan="2" col="2"> <field name="product_id"/>
<separator string="General Accounting" colspan="2"/> <label for="unit_amount"/>
<field name="general_account_id"/> <div>
<field name="move_id" readonly="1"/> <field name="unit_amount" class="oe_form_inline"/>
<field name="product_uom_id" class="oe_form_inline"/>
</div>
</group>
<group string="General Accounting">
<field name="general_account_id"/>
<field name="move_id" readonly="1"/>
</group>
</group> </group>
</form> </form>
</field> </field>
@ -265,19 +276,21 @@
<field name="model">account.analytic.line</field> <field name="model">account.analytic.line</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Project line"> <form string="Project line" version="7.0">
<field name="name"/> <group col="4">
<field name="account_id"/> <field name="name"/>
<field name="date" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/> <field name="account_id"/>
<field name="journal_id"/> <field name="date" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/> <field name="journal_id"/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/> <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/> <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
<field invisible="True" name="general_account_id"/> <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
<field name="amount"/> <field invisible="True" name="general_account_id"/>
<field name="currency_id" /> <field name="amount"/>
<field name="amount_currency" /> <field name="currency_id" />
<field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/> <field name="amount_currency" />
<field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -330,12 +343,14 @@
<field name="model">account.analytic.journal</field> <field name="model">account.analytic.journal</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Analytic Journal"> <form string="Analytic Journal" version="7.0">
<field name="name" select="1"/> <group col="4">
<field name="code" select="1"/> <field name="name"/>
<field name="type" select="2"/> <field name="code"/>
<field name="active" select="2"/> <field name="type"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="active"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -378,72 +393,74 @@
id="account_analytic_journal_print" parent="account.next_id_40"/> id="account_analytic_journal_print" parent="account.next_id_40"/>
# #
# Statistics # Statistics [where is this object in py file ?]
# #
<record id="report_hr_timesheet_invoice_journal_form" model="ir.ui.view"> <!--<record id="report_hr_timesheet_invoice_journal_form" model="ir.ui.view">-->
<field name="name">report.hr.timesheet.invoice.journal.form</field> <!-- <field name="name">report.hr.timesheet.invoice.journal.form</field>-->
<field name="model">report.hr.timesheet.invoice.journal</field> <!-- <field name="model">report.hr.timesheet.invoice.journal</field>-->
<field name="type">form</field> <!-- <field name="type">form</field>-->
<field name="arch" type="xml"> <!-- <field name="arch" type="xml">-->
<form string="Analytic Entries Stats"> <!-- <form string="Analytic Entries Stats" version="7.0">-->
<field name="name" select="1"/> <!-- <group col="4">-->
<field name="account_id" select="1"/> <!-- <field name="name"/>-->
<field name="journal_id" select="2"/> <!-- <field name="account_id"/>-->
</form> <!-- <field name="journal_id"/>-->
</field> <!-- </group>-->
</record> <!-- </form>-->
<!-- </field>-->
<!--</record>-->
<record id="report_hr_timesheet_invoice_journal_tree" model="ir.ui.view"> <!---->
<field name="name">report.hr.timesheet.invoice.journal.tree</field> <!---->
<field name="model">report.hr.timesheet.invoice.journal</field> <!--<record id="report_hr_timesheet_invoice_journal_tree" model="ir.ui.view">-->
<field name="type">tree</field> <!-- <field name="name">report.hr.timesheet.invoice.journal.tree</field>-->
<field name="arch" type="xml"> <!-- <field name="model">report.hr.timesheet.invoice.journal</field>-->
<tree string="Analytic Entries Stats"> <!-- <field name="type">tree</field>-->
<field name="name"/> <!-- <field name="arch" type="xml">-->
<field name="month"/> <!-- <tree string="Analytic Entries Stats">-->
<field name="account_id"/> <!-- <field name="name"/>-->
<field name="journal_id"/> <!-- <field name="month"/>-->
<field name="quantity"/> <!-- <field name="account_id"/>-->
<field name="revenue"/> <!-- <field name="journal_id"/>-->
<field name="cost"/> <!-- <field name="quantity"/>-->
</tree> <!-- <field name="revenue"/>-->
</field> <!-- <field name="cost"/>-->
</record> <!-- </tree>-->
<!-- </field>-->
<record id="report_hr_timesheet_invoice_journal_graph" model="ir.ui.view"> <!--</record>-->
<field name="name">report.hr.timesheet.invoice.journal.graph</field> <!---->
<field name="model">report.hr.timesheet.invoice.journal</field> <!--<record id="report_hr_timesheet_invoice_journal_graph" model="ir.ui.view">-->
<field name="type">graph</field> <!-- <field name="name">report.hr.timesheet.invoice.journal.graph</field>-->
<field name="arch" type="xml"> <!-- <field name="model">report.hr.timesheet.invoice.journal</field>-->
<graph string="Analytic Entries Stats" type="bar"> <!-- <field name="type">graph</field>-->
<field name="name"/> <!-- <field name="arch" type="xml">-->
<field name="month"/> <!-- <graph string="Analytic Entries Stats" type="bar">-->
<field name="cost" operator="+"/> <!-- <field name="name"/>-->
<field name="revenue" operator="+"/> <!-- <field name="month"/>-->
<field group="True" name="journal_id"/> <!-- <field name="cost" operator="+"/>-->
</graph> <!-- <field name="revenue" operator="+"/>-->
</field> <!-- <field group="True" name="journal_id"/>-->
</record> <!-- </graph>-->
<!-- </field>-->
<record id="report_hr_timesheet_invoice_journal_search" model="ir.ui.view"> <!--</record>-->
<field name="name">report.hr.timesheet.invoice.journal.search</field> <!---->
<field name="model">report.hr.timesheet.invoice.journal</field> <!--<record id="report_hr_timesheet_invoice_journal_search" model="ir.ui.view">-->
<field name="type">search</field> <!-- <field name="name">report.hr.timesheet.invoice.journal.search</field>-->
<field name="arch" type="xml"> <!-- <field name="model">report.hr.timesheet.invoice.journal</field>-->
<search string="Analytic Entries Stats"> <!-- <field name="type">search</field>-->
<group> <!-- <field name="arch" type="xml">-->
<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/> <!-- <search string="Analytic Entries Stats">-->
<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/> <!-- <group>-->
<separator orientation="vertical"/> <!-- <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>-->
<field name="name"/> <!-- <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>-->
<field name="month"/> <!-- <separator orientation="vertical"/>-->
<field name="account_id"/> <!-- <field name="name"/>-->
</group> <!-- <field name="month"/>-->
</search> <!-- <field name="account_id"/>-->
</field> <!-- </group>-->
</record> <!-- </search>-->
<!-- </field>-->
<!--</record>-->
<act_window <act_window
context="{'search_default_account_id': [active_id], 'search_default_user_id': False, 'default_account_id': active_id}" context="{'search_default_account_id': [active_id], 'search_default_user_id': False, 'default_account_id': active_id}"

31
addons/account/project/wizard/account_analytic_balance_report_view.xml
View File

@ -7,23 +7,22 @@
<field name="model">account.analytic.balance</field> <field name="model">account.analytic.balance</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select Period"> <form string="Select Period" version="7.0">
<group colspan="4" col="6"> <header>
<field name="date1"/> <button name="check_report" string="Print" type="object" icon="gtk-print"/>
<field name="date2"/> <button special="cancel" string="Cancel" icon="gtk-cancel"/>
<newline/> </header>
<field name="empty_acc"/> <group col="4">
</group> <field name="date1"/>
<separator colspan="4"/> <field name="date2"/>
<group colspan="4" col="6"> <newline/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> <field name="empty_acc"/>
<button name="check_report" string="Print" type="object" icon="gtk-print"/> </group>
</group> </form>
</form>
</field> </field>
</record> </record>
<record id="action_account_analytic_balance" model="ir.actions.act_window"> <record id="action_account_analytic_balance" model="ir.actions.act_window">
<field name="name">Analytic Balance</field> <field name="name">Analytic Balance</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">account.analytic.balance</field> <field name="res_model">account.analytic.balance</field>
@ -31,9 +30,9 @@
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="view_id" ref="account_analytic_balance_view"/> <field name="view_id" ref="account_analytic_balance_view"/>
<field name="target">new</field> <field name="target">new</field>
</record> </record>
<record model="ir.values" id="account_analytic_balance_values"> <record model="ir.values" id="account_analytic_balance_values">
<field name="model_id" ref="analytic.model_account_analytic_account" /> <field name="model_id" ref="analytic.model_account_analytic_account" />
<field name="name">Account Analytic Balance</field> <field name="name">Account Analytic Balance</field>
<field name="key2">client_print_multi</field> <field name="key2">client_print_multi</field>

18
addons/account/project/wizard/account_analytic_chart_view.xml
View File

@ -7,17 +7,15 @@
<field name="model">account.analytic.chart</field> <field name="model">account.analytic.chart</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Analytic Account Charts"> <form string="Analytic Account Charts" version="7.0">
<separator string="Select the Period for Analysis" colspan="4"/> <header>
<field name="from_date"/>
<newline/>
<field name="to_date"/>
<newline/>
<label string="(Keep empty to open the current situation)" align="0.0" colspan="3"/>
<separator colspan="4"/>
<group colspan="4" col="6">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="analytic_account_chart_open_window" string="Open Charts" type="object" icon="gtk-ok"/> <button name="analytic_account_chart_open_window" string="Open Charts" type="object" icon="gtk-ok"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
</header>
<group string="Select the Period for Analysis" col="4">
<field name="from_date"/>
<field name="to_date"/>
<label string="(Keep empty to open the current situation)" colspan="4"/>
</group> </group>
</form> </form>
</field> </field>

69
addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml
View File

@ -2,44 +2,43 @@
<openerp> <openerp>
<data> <data>
<record id="account_analytic_cost_ledger_journal_view" model="ir.ui.view"> <record id="account_analytic_cost_ledger_journal_view" model="ir.ui.view">
<field name="name">Account Analytic Cost Ledger Journal</field> <field name="name">Account Analytic Cost Ledger Journal</field>
<field name="model">account.analytic.cost.ledger.journal.report</field> <field name="model">account.analytic.cost.ledger.journal.report</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select period"> <form string="Select period" version="7.0">
<separator string="Cost Ledger for Period" colspan="4"/> <header>
<field name="date1"/> <button special="cancel" string="Cancel" icon="gtk-cancel"/>
<field name="date2"/> <button name="check_report" string="Print" type="object" icon="gtk-print"/>
<separator string="and Journals" colspan="4"/> </header>
<field name="journal" colspan="4" nolabel="1"/> <group string="Cost Ledger for Period" col="4">
<separator colspan="4"/> <field name="date1"/>
<group colspan="4" col="6"> <field name="date2"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> <field name="journal" colspan="4"/>
<button name="check_report" string="Print" type="object" icon="gtk-print"/> </group>
</group>
</form> </form>
</field> </field>
</record> </record>
<record id="action_account_analytic_cost_ledger_journal" model="ir.actions.act_window"> <record id="action_account_analytic_cost_ledger_journal" model="ir.actions.act_window">
<field name="name">Cost Ledger (Only quantities)</field> <field name="name">Cost Ledger (Only quantities)</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">account.analytic.cost.ledger.journal.report</field> <field name="res_model">account.analytic.cost.ledger.journal.report</field>
<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="view_id" ref="account_analytic_cost_ledger_journal_view"/> <field name="view_id" ref="account_analytic_cost_ledger_journal_view"/>
<field name="target">new</field> <field name="target">new</field>
</record> </record>
<record model="ir.values" id="account_analytic_cost_ledger_journal_values"> <record model="ir.values" id="account_analytic_cost_ledger_journal_values">
<field name="model_id" ref="analytic.model_account_analytic_account" /> <field name="model_id" ref="analytic.model_account_analytic_account" />
<field name="name">Account Analytic Cost Ledger Journal</field> <field name="name">Account Analytic Cost Ledger Journal</field>
<field name="key2">client_print_multi</field> <field name="key2">client_print_multi</field>
<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_cost_ledger_journal'))" /> <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_cost_ledger_journal'))" />
<field name="key">action</field> <field name="key">action</field>
<field name="model">account.analytic.account</field> <field name="model">account.analytic.account</field>
</record> </record>
</data> </data>
</openerp> </openerp>

27
addons/account/project/wizard/account_analytic_cost_ledger_view.xml
View File

@ -7,21 +7,20 @@
<field name="model">account.analytic.cost.ledger</field> <field name="model">account.analytic.cost.ledger</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select Period"> <form string="Select Period" version="7.0">
<group colspan="4" col="6"> <header>
<field name="date1"/> <button name="check_report" string="Print" type="object" icon="gtk-print"/>
<field name="date2"/> <button special="cancel" string="Cancel" icon="gtk-cancel"/>
</group> </header>
<separator colspan="4"/> <group col="4">
<group colspan="4" col="6"> <field name="date1"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> <field name="date2"/>
<button name="check_report" string="Print" type="object" icon="gtk-print"/> </group>
</group> </form>
</form>
</field> </field>
</record> </record>
<record id="action_account_analytic_cost" model="ir.actions.act_window"> <record id="action_account_analytic_cost" model="ir.actions.act_window">
<field name="name">Cost Ledger</field> <field name="name">Cost Ledger</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">account.analytic.cost.ledger</field> <field name="res_model">account.analytic.cost.ledger</field>
@ -29,9 +28,9 @@
<field name="view_mode">form</field> <field name="view_mode">form</field>
<field name="view_id" ref="account_analytic_cost_view"/> <field name="view_id" ref="account_analytic_cost_view"/>
<field name="target">new</field> <field name="target">new</field>
</record> </record>
<record model="ir.values" id="account_analytic_cost_values"> <record model="ir.values" id="account_analytic_cost_values">
<field name="model_id" ref="analytic.model_account_analytic_account" /> <field name="model_id" ref="analytic.model_account_analytic_account" />
<field name="name">Account Analytic Cost</field> <field name="name">Account Analytic Cost</field>
<field name="key2">client_print_multi</field> <field name="key2">client_print_multi</field>

13
addons/account/project/wizard/account_analytic_inverted_balance_report.xml
View File

@ -7,16 +7,15 @@
<field name="model">account.analytic.inverted.balance</field> <field name="model">account.analytic.inverted.balance</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select Period"> <form string="Select Period" version="7.0">
<group colspan="4" col="6"> <header>
<button name="check_report" string="Print" type="object" icon="gtk-print"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
</header>
<group col="4">
<field name="date1"/> <field name="date1"/>
<field name="date2"/> <field name="date2"/>
</group> </group>
<separator colspan="4"/>
<group colspan="4" col="6">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" icon="gtk-print"/>
</group>
</form> </form>
</field> </field>
</record> </record>

69
addons/account/project/wizard/account_analytic_journal_report_view.xml
View File

@ -2,43 +2,42 @@
<openerp> <openerp>
<data> <data>
<record id="account_analytic_journal_view" model="ir.ui.view"> <record id="account_analytic_journal_view" model="ir.ui.view">
<field name="name">Account Analytic Journal</field> <field name="name">Account Analytic Journal</field>
<field name="model">account.analytic.journal.report</field> <field name="model">account.analytic.journal.report</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select Period"> <form string="Select Period" version="7.0">
<group colspan="4" col="6"> <header>
<field name="date1"/> <button name="check_report" string="Print" type="object" icon="gtk-print"/>
<field name="date2"/> <button special="cancel" string="Cancel" icon="gtk-cancel"/>
</group> </header>
<separator colspan="4"/> <group col="4">
<group colspan="4" col="6"> <field name="date1"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> <field name="date2"/>
<button name="check_report" string="Print" type="object" icon="gtk-print"/> </group>
</group> </form>
</form> </field>
</field> </record>
</record>
<record id="action_account_analytic_journal" model="ir.actions.act_window"> <record id="action_account_analytic_journal" model="ir.actions.act_window">
<field name="name">Analytic Journal</field> <field name="name">Analytic Journal</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">account.analytic.journal.report</field> <field name="res_model">account.analytic.journal.report</field>
<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="view_id" ref="account_analytic_journal_view"/> <field name="view_id" ref="account_analytic_journal_view"/>
<field name="target">new</field> <field name="target">new</field>
</record> </record>
<record model="ir.values" id="account_analytic_journal_values"> <record model="ir.values" id="account_analytic_journal_values">
<field name="model_id" ref="account.model_account_analytic_journal" /> <field name="model_id" ref="account.model_account_analytic_journal" />
<field name="name">Account Analytic Journal</field> <field name="name">Account Analytic Journal</field>
<field name="key2">client_print_multi</field> <field name="key2">client_print_multi</field>
<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_journal'))" /> <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_analytic_journal'))" />
<field name="key">action</field> <field name="key">action</field>
<field name="model">account.analytic.journal</field> <field name="model">account.analytic.journal</field>
</record> </record>
</data> </data>
</openerp> </openerp>

24
addons/account/project/wizard/project_account_analytic_line_view.xml
View File

@ -2,23 +2,21 @@
<openerp> <openerp>
<data> <data>
<record id="view_project_account_analytic_line_form" model="ir.ui.view"> <record id="view_project_account_analytic_line_form" model="ir.ui.view">
<field name="name">project.account.analytic.line.form</field> <field name="name">project.account.analytic.line.form</field>
<field name="model">project.account.analytic.line</field> <field name="model">project.account.analytic.line</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="View Account Analytic Lines"> <form string="View Account Analytic Lines" version="7.0">
<group colspan="4" > <header>
<field name="from_date"/> <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/>
<newline/> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
<field name="to_date" /> </header>
<group col="4">
<field name="from_date"/>
<field name="to_date"/>
</group> </group>
<label string ="(Keep empty to open the current situation)" /> <label string ="(Keep empty to open the current situation)" />
<separator string="" colspan="4" />
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -33,4 +31,4 @@
</record> </record>
</data> </data>
</openerp> </openerp>

1
addons/account/report/account_report.py
View File

@ -91,6 +91,7 @@ class report_aged_receivable(osv.osv):
def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
""" To call the init() method timely """ To call the init() method timely
""" """
if context is None:context = {}
if not self.called: if not self.called:
self.init(cr, user) self.init(cr, user)
self.called = True # To make sure that init doesn't get called multiple times self.called = True # To make sure that init doesn't get called multiple times

70
addons/account/report/account_report_view.xml
View File

@ -34,9 +34,11 @@
<field name="model">report.account.receivable</field> <field name="model">report.account.receivable</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Accounts by Type"> <form string="Accounts by Type" version="7.0">
<field name="name" select="1"/> <group>
<field name="type" select="1"/> <field name="name"/>
<field name="type"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -68,8 +70,8 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Aged Receivable"> <tree string="Aged Receivable">
<field name="name" select="1"/> <field name="name"/>
<field name="balance" select="2"/> <field name="balance"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -89,8 +91,8 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state in('paid','cancel') " string="Invoices"> <tree colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state in('paid','cancel') " string="Invoices">
<field name="create_date" select="1"/> <field name="create_date"/>
<field name="name" select="1"/> <field name="name"/>
<field name="type"/> <field name="type"/>
<field name="number"/> <field name="number"/>
<field name="partner_id"/> <field name="partner_id"/>
@ -98,30 +100,30 @@
<field name="amount_total" sum="Total Amount"/> <field name="amount_total" sum="Total Amount"/>
<field name="currency_id"/> <field name="currency_id"/>
<field name="date_invoice"/> <field name="date_invoice"/>
<field name="date_due" select="1"/> <field name="date_due"/>
<field name="residual"/> <field name="residual"/>
<field name="state" select="2"/> <field name="state"/>
<field name="origin"/> <field name="origin"/>
</tree> </tree>
</field> </field>
</record> </record>
<record id="action_view_created_invoice_dashboard" model="ir.actions.act_window"> <record id="action_view_created_invoice_dashboard" model="ir.actions.act_window">
<field name="name">Invoices Created Within Past 15 Days</field> <field name="name">Invoices Created Within Past 15 Days</field>
<field name="res_model">report.invoice.created</field> <field name="res_model">report.invoice.created</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="view_id" ref="board_view_created_invoice"/> <field name="view_id" ref="board_view_created_invoice"/>
</record> </record>
<record id="view_report_account_sales_tree" model="ir.ui.view"> <record id="view_report_account_sales_tree" model="ir.ui.view">
<field name="name">report.account.sales.tree</field> <field name="name">report.account.sales.tree</field>
<field name="model">report.account.sales</field> <field name="model">report.account.sales</field>
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Sales by Account"> <tree string="Sales by Account">
<field name="name" select="1"/> <field name="name"/>
<field name="month" select="1"/> <field name="month"/>
<field name="product_id"/> <field name="product_id"/>
<field name="account_id"/> <field name="account_id"/>
<field name="quantity"/> <field name="quantity"/>
@ -149,11 +151,11 @@
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Sales by Account"> <search string="Sales by Account">
<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/> <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="This year's Sales by type"/>
<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/> <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This months' Sales by type"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="name"/> <field name="name"/>
<field name="month"/> <field name="month"/>
</search> </search>
</field> </field>
</record> </record>
@ -166,7 +168,7 @@
<field name="search_view_id" ref="view_report_account_sales_search"/> <field name="search_view_id" ref="view_report_account_sales_search"/>
</record> </record>
<record id="view_report_account_type_sales_tree" model="ir.ui.view"> <record id="view_report_account_type_sales_tree" model="ir.ui.view">
<field name="name">report.account_type.sales.tree</field> <field name="name">report.account_type.sales.tree</field>
<field name="model">report.account_type.sales</field> <field name="model">report.account_type.sales</field>
<field name="type">tree</field> <field name="type">tree</field>
@ -190,9 +192,9 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Sales by Account Type"> <tree string="Sales by Account Type">
<field name="name" select="1"/> <field name="name"/>
<field name="month" select="1"/> <field name="month"/>
<field name="product_id" select="1"/> <field name="product_id"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -209,17 +211,17 @@
</field> </field>
</record> </record>
<record id="view_report_account_type_sales_search" model="ir.ui.view"> <record id="view_report_account_type_sales_search" model="ir.ui.view">
<field name="name">report.account_type.sales.search</field> <field name="name">report.account_type.sales.search</field>
<field name="model">report.account_type.sales</field> <field name="model">report.account_type.sales</field>
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<search string="Sales by Account"> <search string="Sales by Account">
<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/> <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="All Months Sales by type"/>
<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/> <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="This Months Sales by type"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="name"/> <field name="name"/>
<field name="month"/> <field name="month"/>
</search> </search>
</field> </field>
</record> </record>

192
addons/account/res_config_view.xml
View File

@ -15,109 +15,105 @@
<field name="model">account.config.settings</field> <field name="model">account.config.settings</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Configure Accounting" layout="manual"> <form string="Configure Accounting" version="7.0">
<header> <header>
<button string="Apply" type="object" name="execute"/> <button string="Apply" type="object" name="execute"/>
<button string="Cancel" special="cancel"/> <button string="Cancel" special="cancel"/>
</header> </header>
<sheet layout="auto"> <group col="4">
<group> <field name="has_default_company" invisible="1" />
<separator string="Accounting Details of Company" colspan="4"/> <field name="has_chart_of_accounts" invisible="1"/>
<field name="has_default_company" invisible="1"/> <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"
<field name="has_chart_of_accounts" invisible="1"/> attrs="{'invisible': [('has_default_company', '=', True)]}"/>
<field name="company_id" groups="base.group_multi_company" widget="selection" on_change="onchange_company_id(company_id)" <field name="expects_chart_of_accounts"/>
attrs="{'invisible': [('has_default_company', '=', True)]}"/> </group>
<field name="expects_chart_of_accounts"/>
<group string="No Chart of Accounts exists for this Company" colspan="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}"> <group string="Select a Chart of Accounts to Install" col="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
<label string="Please select a chart template to install a chart of accounts." colspan="4"/> <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
<field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/> <button string="Install More Chart Templates" icon="gtk-go-forward"
<button string="Install More Chart Templates" icon="gtk-go-forward" name="%(open_account_charts_modules)d" type="action"/>
name="%(open_account_charts_modules)d" type="action"/> <newline/>
<newline/> <field name="code_digits" groups="account.group_account_user"/>
<field name ="code_digits" groups="account.group_account_user"/> <field name="seq_journal"/>
<field name ="seq_journal"/> <newline/>
<newline/> <field name="complete_tax_set" invisible="1"/>
<field name ="complete_tax_set" invisible="1"/> <field name="sale_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
<field name="sale_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/> <field name="purchase_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}"
<field name="purchase_tax" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',False)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/> <field name="sale_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/>
<field name ="sale_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}" on_change="onchange_tax_rate(sale_tax_rate)"/> <field name="purchase_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}"/>
<field name ="purchase_tax_rate" attrs="{'invisible': ['|', ('chart_template_id','=',False), ('complete_tax_set','=',True)]}"/> </group>
</group>
<field name="has_fiscal_year" invisible="1"/> <field name="has_fiscal_year" invisible="1"/>
<group string="No Fiscal Year exists for this Company" colspan="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}"> <group string="No Fiscal Year Defined for this Company" col="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_fiscal_year','=',True)]}">
<field name="date_start" on_change="onchange_start_date(date_start)"/> <field name="date_start" on_change="onchange_start_date(date_start)"/>
<field name="date_stop"/> <field name="date_stop"/>
<field name="period" colspan="4"/> <field name="period" colspan="4"/>
</group> </group>
<group colspan="4">
<separator string="Accounting Configuration" colspan="4"/> <field name="complete_tax_set" invisible="1"/>
<field name ="complete_tax_set" invisible="1"/> <group string="Accounting Configuration">
<newline/> <group colspan="" col="2">
<group colspan="" col="2"> <field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]" attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
<field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]" attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/> <field name="module_account_accountant"/>
<field name="module_account_accountant"/> <field name="module_account_asset"/>
<field name="module_account_asset"/>
</group>
<group colspan="2" col="2">
<field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]" attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
<field name="currency_id" widget="selection"/>
<field name="module_account_budget"/>
<field name="decimal_precision"/>
</group>
</group>
<group colspan="2" col="2">
<separator string="Customer Invoices" colspan="2"/>
<field name="sale_journal_id" invisible="1"/>
<label string="Next Invoice Number" for="sale_sequence_prefix" help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<group colspan="1" col="2">
<field name="sale_sequence_prefix" nolabel="1"/>
<field name="sale_sequence_next" nolabel="1" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
</group>
<field name="sale_refund_journal_id" invisible="1"/>
<label string="Next Credit Note Number" for="sale_refund_sequence_prefix" help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<group colspan="1" col="2">
<field name="sale_refund_sequence_prefix" nolabel="1"/>
<field name="sale_refund_sequence_next" nolabel="1" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
</group>
<field name="module_account_invoice_layout"/>
<field name="module_account_voucher"/>
<field name="module_account_followup"/>
<field name="group_proforma_invoices"/>
</group>
<group colspan="2" col="2">
<separator string="Supplier Invoices" colspan="2"/>
<field name="purchase_journal_id" invisible="1"/>
<label string="Next Supplier Invoice Number" for="purchase_sequence_prefix" help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<group colspan="1" col="2">
<field name="purchase_sequence_prefix" nolabel="1"/>
<field name="purchase_sequence_next" nolabel="1" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
</group>
<field name="purchase_refund_journal_id" invisible="1"/>
<label string="Next Supplier Credit Note Number" for="purchase_refund_sequence_prefix" help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<group colspan="1" col="2">
<field name="purchase_refund_sequence_prefix" nolabel="1"/>
<field name="purchase_refund_sequence_next" nolabel="1" attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
</group>
<field name="module_account_payment"/>
</group>
<group colspan="2" col="2">
<separator string="Electronic Payments" colspan="2"/>
<field name="paypal_account"/>
</group>
<group colspan="2" col="2">
<separator string="Bank &amp; Cash" colspan="2"/>
<b><label string="Configure Bank Accounts :"/></b>
<button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
<field name="company_footer"/>
<field name="module_account_check_writing"/>
</group>
<group name="analytic_accounting" colspan="4" invisible="1">
<separator string="Analytic Accounting" colspan="4"/>
</group>
</group> </group>
</sheet> <group>
<field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]" attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
<field name="currency_id"/>
<field name="module_account_budget"/>
<field name="decimal_precision"/>
</group>
</group>
<field name="sale_journal_id" invisible="1"/>
<field name="sale_refund_journal_id" invisible="1"/>
<field name="purchase_journal_id" invisible="1"/>
<field name="purchase_refund_journal_id" invisible="1"/>
<group>
<group string="Customer Invoices">
<label string="Next Invoice Number" for="sale_sequence_prefix" help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<div>
<field name="sale_sequence_prefix" class="oe_form_inline"/>
<field name="sale_sequence_next" class="oe_form_inline" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
</div>
<label string="Next Credit Note Number" for="sale_refund_sequence_prefix" help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<div>
<field name="sale_refund_sequence_prefix" class="oe_form_inline"/>
<field name="sale_refund_sequence_next" class="oe_form_inline" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
</div>
<field name="module_account_invoice_layout"/>
<field name="module_account_voucher"/>
<field name="module_account_followup"/>
<field name="group_proforma_invoices"/>
</group>
<group string="Supplier Invoices">
<label string="Next Supplier Invoice Number" for="purchase_sequence_prefix" help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<div>
<field name="purchase_sequence_prefix" class="oe_form_inline"/>
<field name="purchase_sequence_next" class="oe_form_inline" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
</div>
<label string="Next Supplier Credit Note Number" for="purchase_refund_sequence_prefix" help='If you put "%%(year)s" in the prefix, it will be replaced by the current year.'/>
<div>
<field name="purchase_refund_sequence_prefix" class="oe_form_inline"/>
<field name="purchase_refund_sequence_next" class="oe_form_inline"
attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
</div>
<field name="module_account_payment"/>
</group>
<group string="Electronic Payments">
<field name="paypal_account"/>
</group>
<group string="Bank &amp; Cash">
<b><label string="Configure Bank Accounts :"/></b>
<button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
<field name="company_footer"/>
<field name="module_account_check_writing"/>
</group>
<group name="analytic_accounting" invisible="1" string="Analytic Accounting"/>
</group>
</form> </form>
</field> </field>
</record> </record>

38
addons/account/wizard/account_automatic_reconcile_view.xml
View File

@ -7,28 +7,24 @@
<field name="model">account.automatic.reconcile</field> <field name="model">account.automatic.reconcile</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Reconciliation"> <form string="Reconciliation" version="7.0">
<separator string="Reconciliation" colspan="4"/> <header>
<label colspan="4" nolabel="1" string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/> <button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize"/>
<newline/> <button special="cancel" string="Cancel" icon="gtk-cancel"/>
<group> </header>
<field name="account_ids" colspan="4" domain="[('reconcile','=',1)]"/> <separator string="Reconciliation"/>
<label string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
<field name="account_ids" domain="[('reconcile','=',1)]"/>
<group col="4">
<field name="power"/> <field name="power"/>
<field name="allow_write_off"/> <field name="allow_write_off"/>
</group> </group>
<newline/> <group col="4" attrs="{'readonly':[('allow_write_off', '!=', True)]}" string="Write-Off Move">
<group attrs="{'readonly':[('allow_write_off', '!=', True)]}">
<separator string="Write-Off Move" colspan="4"/>
<field name="max_amount"/> <field name="max_amount"/>
<field name="writeoff_acc_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/> <field name="writeoff_acc_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
<field name="journal_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/> <field name="journal_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
<field name="period_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/> <field name="period_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
</group> </group>
<separator string ="" colspan="4"/>
<group colspan="2" col="4">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -56,14 +52,14 @@
<field name="model">account.automatic.reconcile</field> <field name="model">account.automatic.reconcile</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Reconciliation Result"> <form string="Reconciliation Result" version="7.0">
<field name="reconciled"/> <header>
<newline/>
<field name="unreconciled"/>
<group colspan="4" col="6">
<separator colspan="6"/>
<button special="cancel" string="Ok" icon="terp-dialog-close" default_focus="1"/> <button special="cancel" string="Ok" icon="terp-dialog-close" default_focus="1"/>
</group> </header>
<group>
<field name="reconciled"/>
<field name="unreconciled"/>
</group>
</form> </form>
</field> </field>
</record> </record>

12
addons/account/wizard/account_change_currency_view.xml
View File

@ -6,13 +6,13 @@
<field name="model">account.change.currency</field> <field name="model">account.change.currency</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Invoice Currency"> <form string="Invoice Currency" version="7.0">
<separator colspan="4" string="This wizard will change the currency of the invoice"/> <header>
<field name="currency_id"/>
<separator colspan="4"/>
<group colspan="2" col="4">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="change_currency" string="Change Currency" type="object" icon="terp-stock_effects-object-colorize"/> <button name="change_currency" string="Change Currency" type="object" icon="terp-stock_effects-object-colorize"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
</header>
<group string="This wizard will change the currency of the invoice">
<field name="currency_id"/>
</group> </group>
</form> </form>
</field> </field>

11
addons/account/wizard/account_chart_view.xml
View File

@ -6,7 +6,11 @@
<field name="model">account.chart</field> <field name="model">account.chart</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Account charts"> <form string="Account charts" version="7.0">
<header>
<button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
</header>
<group colspan="4"> <group colspan="4">
<field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/> <field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>
<field name="target_move"/> <field name="target_move"/>
@ -15,11 +19,6 @@
<field name="period_from"/> <field name="period_from"/>
<field name="period_to"/> <field name="period_to"/>
</group> </group>
<separator string="" colspan="4"/>
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object"/>
</group>
</form> </form>
</field> </field>
</record> </record>

20
addons/account/wizard/account_fiscalyear_close_state.xml
View File

@ -6,16 +6,16 @@
<field name="model">account.fiscalyear.close.state</field> <field name="model">account.fiscalyear.close.state</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Close states of Fiscal year and periods"> <form string="Close states of Fiscal year and periods" version="7.0">
<separator string="Close states of Fiscal year and periods" colspan="4" /> <header>
<label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive " colspan="4"/> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
<newline/> <button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/>
<field name="fy_id" domain = "[('state','=','draft')]" colspan="4"/> </header>
<separator colspan="4" /> <separator string="Close states of Fiscal year and periods"/>
<group colspan="4" col="6"> <label string ="If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive "/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <group>
<button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/> <field name="fy_id" domain="[('state','=','draft')]"/>
</group> </group>
</form> </form>
</field> </field>
</record> </record>

34
addons/account/wizard/account_fiscalyear_close_view.xml
View File

@ -6,23 +6,23 @@
<field name="model">account.fiscalyear.close</field> <field name="model">account.fiscalyear.close</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Generate Fiscal Year Opening Entries"> <form string="Generate Fiscal Year Opening Entries" version="7.0">
<separator string="Generate Fiscal Year Opening Entries" colspan="4"/> <header>
<label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones." colspan="4"/> <button icon="gtk-execute" string="Create" name="data_save" type="object"/>
<newline/> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
<field name="fy_id" domain = "[('state','=','draft')]"/> </header>
<field name="fy2_id" domain = "[('state','=','draft')]"/> <separator string="Generate Fiscal Year Opening Entries"/>
<field name="journal_id"/> <label string="This wizard will generate the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year: it will simply replace the old opening entries with the new ones."/>
<field name="period_id" domain ="[('fiscalyear_id','=',fy2_id),('special','=', True)]" /> <newline/>
<field name="report_name" colspan="4"/> <group col="4">
<separator colspan="4"/> <field name="fy_id" domain = "[('state','=','draft')]"/>
<group colspan="4" col="6"> <field name="fy2_id" domain = "[('state','=','draft')]"/>
<label string="" colspan="2"/> <field name="journal_id"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <field name="period_id" domain ="[('fiscalyear_id','=',fy2_id),('special','=', True)]" />
<button icon="gtk-execute" string="Create" name="data_save" type="object"/> <field name="report_name"/>
</group> </group>
</form> </form>
</field> </field>
</record> </record>
<record id="action_account_fiscalyear_close" model="ir.actions.act_window"> <record id="action_account_fiscalyear_close" model="ir.actions.act_window">

1
addons/account/wizard/account_invoice_refund.py
View File

@ -60,6 +60,7 @@ class account_invoice_refund(osv.osv_memory):
} }
def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False): def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
if context is None:context = {}
journal_obj = self.pool.get('account.journal') journal_obj = self.pool.get('account.journal')
user_obj = self.pool.get('res.users') user_obj = self.pool.get('res.users')
# remove the entry with key 'form_view_ref', otherwise fields_view_get crashes # remove the entry with key 'form_view_ref', otherwise fields_view_get crashes

24
addons/account/wizard/account_invoice_refund_view.xml
View File

@ -7,26 +7,22 @@
<field name="model">account.invoice.refund</field> <field name="model">account.invoice.refund</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Credit Note"> <form string="Credit Note" version="7.0">
<separator string="Credit Note Options" colspan="4"/> <header>
<group colspan="4" > <button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button string='Refund' icon="gtk-execute" name="invoice_refund" type="object"/>
</header>
<separator string="Credit Note Options"/>
<group col="4">
<field name="description"/> <field name="description"/>
<field name="journal_id" widget='selection'/> <field name="journal_id" widget='selection'/>
<field name="date"/> <field name="date"/>
<field name="period"/> <field name="period"/>
<field name="filter_refund"/> <field name="filter_refund"/>
</group> </group>
<separator colspan="4"/> <label string="Modify Invoice: Cancels the current invoice and creates a new copy of it ready for editing."/>
<group col="4" colspan="4" fill="1"> <label string="Credit Note: Creates the credit note, ready for editing."/>
<label align="0.0" width="550" colspan="4" string="Modify Invoice: Cancels the current invoice and creates a new copy of it ready for editing."/> <label string="Cancel Invoice: Creates the credit note, validate and reconcile it to cancel the current invoice."/>
<label align="0.0" width="300" string="Credit Note: Creates the credit note, ready for editing."/>
<label align="0.0" width="500" colspan="4" string="Cancel Invoice: Creates the credit note, validate and reconcile it to cancel the current invoice."/>
</group>
<separator colspan="4"/>
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button string='Refund' icon="gtk-execute" name="invoice_refund" type="object"/>
</group>
</form> </form>
</field> </field>
</record> </record>

4
addons/account/wizard/account_invoice_state_view.xml
View File

@ -6,7 +6,7 @@
<field name="model">account.invoice.confirm</field> <field name="model">account.invoice.confirm</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Confirm Draft Invoices"> <form string="Confirm Draft Invoices" version="7.0">
<separator string="Confirm Draft Invoices" colspan="4"/> <separator string="Confirm Draft Invoices" colspan="4"/>
<group colspan="4" col="6"> <group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Close"/> <button icon="gtk-cancel" special="cancel" string="Close"/>
@ -27,7 +27,7 @@
<field name="model">account.invoice.cancel</field> <field name="model">account.invoice.cancel</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Cancel Selected Invoices"> <form string="Cancel Selected Invoices" version="7.0">
<separator string="Cancel Selected Invoices" colspan="4"/> <separator string="Cancel Selected Invoices" colspan="4"/>
<group colspan="4" col="6"> <group colspan="4" col="6">
<button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/> <button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>

15
addons/account/wizard/account_journal_select_view.xml
View File

@ -7,14 +7,13 @@
<field name="model">account.journal.select</field> <field name="model">account.journal.select</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Journal Select"> <form string="Journal Select" version="7.0">
<label string="Are you sure you want to open Journal Entries?" colspan="4"/> <header>
<separator string="" colspan="4" /> <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/>
<group colspan="4" col="6"> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> </header>
<button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/> <label string="Are you sure you want to open Journal Entries?"/>
</group> </form>
</form>
</field> </field>
</record> </record>

14
addons/account/wizard/account_move_bank_reconcile_view.xml
View File

@ -6,16 +6,14 @@
<field name="model">account.move.bank.reconcile</field> <field name="model">account.move.bank.reconcile</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Bank reconciliation"> <form string="Bank reconciliation" version="7.0">
<group colspan="4" > <header>
<button icon="terp-gtk-go-back-rtl" string="Open for Bank Reconciliation" name="action_open_window" type="object"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
</header>
<group>
<field name="journal_id"/> <field name="journal_id"/>
</group> </group>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-gtk-go-back-rtl" string="Open for Bank Reconciliation" name="action_open_window" type="object"/>
</group>
</form> </form>
</field> </field>
</record> </record>

96
addons/account/wizard/account_move_journal.py
View File

@ -77,56 +77,56 @@ class account_move_journal(osv.osv_memory):
@return: Returns a dict that contains definition for fields, views, and toolbars @return: Returns a dict that contains definition for fields, views, and toolbars
""" """
if context is None:context = {}
res = super(account_move_journal, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False) res = super(account_move_journal, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
if not view_id: if context:
return res if not view_id:
return res
period_pool = self.pool.get('account.period')
journal_pool = self.pool.get('account.journal') period_pool = self.pool.get('account.period')
journal_pool = self.pool.get('account.journal')
journal_id = self._get_journal(cr, uid, context)
period_id = self._get_period(cr, uid, context) journal_id = self._get_journal(cr, uid, context)
period_id = self._get_period(cr, uid, context)
journal = False
if journal_id: journal = False
journal = journal_pool.read(cr, uid, [journal_id], ['name'])[0]['name'] if journal_id:
journal_string = _("Journal: %s") % tools.ustr(journal) journal = journal_pool.read(cr, uid, [journal_id], ['name'])[0]['name']
else: journal_string = _("Journal: %s") % tools.ustr(journal)
journal_string = _("Journal: All") else:
journal_string = _("Journal: All")
period = False
if period_id: period = False
period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name'] if period_id:
period_string = _("Period: %s") % tools.ustr(period) period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name']
period_string = _("Period: %s") % tools.ustr(period)
separator_string = _("Open Journal Items !")
cancel_string = _("Cancel") separator_string = _("Open Journal Items !")
open_string = _("Open") cancel_string = _("Cancel")
view = """<?xml version="1.0" encoding="utf-8"?> open_string = _("Open")
<form string="Standard entries"> view = """<?xml version="1.0" encoding="utf-8"?>
<separator string="%s" colspan="4"/> <form string="Standard entries">
<field name="target_move" /> <header>
<newline/> <button icon="terp-gtk-go-back-rtl" string="%s" name="action_open_window" default_focus="1" type="object"/>
<group colspan="4" > <button icon="gtk-cancel" special="cancel" string="%s"/>
<label width="300" string="%s"/> </header>
<newline/> <group string="%s" colspan="4">
<label width="300" string="%s"/> <field name="target_move" />
</group> </group>
<group colspan="4" col="4"> <group colspan="4" >
<label string ="" colspan="2"/> <label width="300" string="%s"/>
<button icon="gtk-cancel" special="cancel" string="%s"/> <newline/>
<button icon="terp-gtk-go-back-rtl" string="%s" name="action_open_window" default_focus="1" type="object"/> <label width="300" string="%s"/>
</group> </group>
</form>""" % (separator_string, journal_string, period_string, cancel_string, open_string) </form>""" % (open_string, cancel_string, separator_string, journal_string, period_string)
view = etree.fromstring(view.encode('utf8')) view = etree.fromstring(view.encode('utf8'))
xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context) xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)
view = xarch view = xarch
res.update({ res.update({
'arch': view 'arch': view
}) })
return res return res
def action_open_window(self, cr, uid, ids, context=None): def action_open_window(self, cr, uid, ids, context=None):

14
addons/account/wizard/account_move_line_reconcile_select_view.xml
View File

@ -6,16 +6,14 @@
<field name="model">account.move.line.reconcile.select</field> <field name="model">account.move.line.reconcile.select</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Reconciliation"> <form string="Reconciliation" version="7.0">
<group colspan="4" > <header>
<button icon="terp-gtk-go-back-rtl" string="Open for Reconciliation" name="action_open_window" type="object" />
<button icon="gtk-cancel" special="cancel" string="Cancel" />
</header>
<group>
<field name="account_id"/> <field name="account_id"/>
</group> </group>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel" />
<button icon="terp-gtk-go-back-rtl" string="Open for Reconciliation" name="action_open_window" type="object" />
</group>
</form> </form>
</field> </field>
</record> </record>

9
addons/account/wizard/account_move_line_select_view.xml
View File

@ -7,13 +7,12 @@
<field name="model">account.move.line.select</field> <field name="model">account.move.line.select</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Account Select"> <form string="Account Select" version="7.0">
<label string="Are you sure you want to open Account move line entries!" colspan="4"/> <header>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1"/> <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1"/>
</group> </header>
<label string="Are you sure you want to open Account move line entries!"/>
</form> </form>
</field> </field>
</record> </record>

14
addons/account/wizard/account_move_line_unreconcile_select_view.xml
View File

@ -6,16 +6,14 @@
<field name="model">account.move.line.unreconcile.select</field> <field name="model">account.move.line.unreconcile.select</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Unreconciliation"> <form string="Unreconciliation" version="7.0">
<group colspan="4" > <header>
<button icon="terp-gtk-go-back-rtl" string="Open for Unreconciliation" name="action_open_window" type="object" />
<button icon="gtk-cancel" special="cancel" string="Cancel" />
</header>
<group>
<field name="account_id"/> <field name="account_id"/>
</group> </group>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel" />
<button icon="terp-gtk-go-back-rtl" string="Open for Unreconciliation" name="action_open_window" type="object" />
</group>
</form> </form>
</field> </field>
</record> </record>

12
addons/account/wizard/account_open_closed_fiscalyear_view.xml
View File

@ -6,15 +6,13 @@
<field name="model">account.open.closed.fiscalyear</field> <field name="model">account.open.closed.fiscalyear</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Choose Fiscal Year "> <form string="Choose Fiscal Year " version="7.0">
<group colspan="4" > <header>
<field name="fyear_id" domain = "[('state','=','draft')]"/>
</group>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/> <button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/>
</header>
<group>
<field name="fyear_id" domain="[('state','=','draft')]"/>
</group> </group>
</form> </form>
</field> </field>

16
addons/account/wizard/account_period_close_view.xml
View File

@ -7,17 +7,15 @@
<field name="model">account.period.close</field> <field name="model">account.period.close</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Close Period"> <form string="Close Period" version="7.0">
<group colspan="4" > <header>
<separator string="Are you sure?" colspan="4"/>
<field name="sure"/>
</group>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-gtk-go-back-rtl" string="Close Period" name="data_save" type="object"/> <button icon="terp-gtk-go-back-rtl" string="Close Period" name="data_save" type="object"/>
</group> </header>
<separator string="Are you sure?" colspan="4"/>
<group>
<field name="sure"/>
</group>
</form> </form>
</field> </field>
</record> </record>

18
addons/account/wizard/account_reconcile_partner_process_view.xml
View File

@ -6,16 +6,16 @@
<field name="model">account.partner.reconcile.process</field> <field name="model">account.partner.reconcile.process</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Partner Reconciliation"> <form string="Partner Reconciliation" version="7.0">
<field name="progress" widget="progressbar" colspan="4"/> <header>
<field name="today_reconciled"/>
<field name="to_reconcile"/>
<newline/>
<field name="next_partner_id" colspan="4"/>
<newline/>
<group colspan="4" col="4">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" /> <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" />
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
</header>
<group col="4">
<field name="next_partner_id"/>
<field name="progress" widget="progressbar" colspan="4"/>
<field name="today_reconciled"/>
<field name="to_reconcile"/>
</group> </group>
</form> </form>
</field> </field>

44
addons/account/wizard/account_reconcile_view.xml
View File

@ -7,21 +7,21 @@
<field name="model">account.move.line.reconcile</field> <field name="model">account.move.line.reconcile</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Reconciliation"> <form string="Reconciliation" version="7.0">
<separator string="Reconciliation Transactions" colspan="4"/> <header>
<field name="trans_nbr"/>
<newline/>
<field name="credit"/>
<field name="debit"/>
<separator string="Write-Off" colspan="4"/>
<field name="writeoff"/>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}"/> <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}"/>
<button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/> <button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
<button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/> <button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
</group> </header>
<group col="4" string="Reconciliation Transactions">
<field name="trans_nbr"/>
<newline/>
<field name="credit"/>
<field name="debit"/>
</group><group string="Write-Off">
<field name="writeoff"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -49,18 +49,18 @@
<field name="model">account.move.line.reconcile.writeoff</field> <field name="model">account.move.line.reconcile.writeoff</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Information addendum"> <form string="Information addendum" version="7.0">
<separator string="Write-Off Move" colspan="4"/> <header>
<field name="journal_id"/>
<field name="writeoff_acc_id" domain="[('type', '&lt;&gt;', 'view')]"/>
<field name="date_p"/>
<field name="comment"/>
<field name="analytic_id" groups="analytic.group_analytic_accounting"/>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1"/> <button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1"/>
</group> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
</header>
<group string="Write-Off Move" col="4">
<field name="journal_id"/>
<field name="writeoff_acc_id" domain="[('type', '&lt;&gt;', 'view')]"/>
<field name="date_p"/>
<field name="comment"/>
<field name="analytic_id" groups="analytic.group_analytic_accounting"/>
</group>
</form> </form>
</field> </field>
</record> </record>

33
addons/account/wizard/account_report_aged_partner_balance_view.xml
View File

@ -8,24 +8,23 @@
<field name="type">form</field> <field name="type">form</field>
<!--<field name="inherit_id" ref="account_common_report_view" />--> <!--<field name="inherit_id" ref="account_common_report_view" />-->
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Report Options"> <form string="Report Options" version="7.0">
<separator colspan="4" string="Aged Partner Balance"/> <header>
<label colspan="4" nolabel="1" string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
<newline/>
<field name="chart_account_id" widget='selection'/>
<newline/>
<field name="date_from"/>
<field name="period_length"/>
<newline/>
<field name="result_selection"/>
<field name="direction_selection"/>
<field name="journal_ids" required="0" invisible="1"/>
<newline/>
<separator colspan="4"/>
<group col="4" colspan="4">
<button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
<button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1"/> <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1"/>
</group> <button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
</header>
<separator string="Aged Partner Balance"/>
<label string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
<group col="4">
<field name="chart_account_id" widget='selection'/>
<newline/>
<field name="date_from"/>
<field name="period_length"/>
<newline/>
<field name="result_selection"/>
<field name="direction_selection"/>
</group>
<field name="journal_ids" required="0" invisible="1"/>
</form> </form>
</field> </field>
</record> </record>

1
addons/account/wizard/account_report_common.py
View File

@ -67,6 +67,7 @@ class account_common_report(osv.osv_memory):
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
if context is None:context = {}
res = super(account_common_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False) res = super(account_common_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
if context.get('active_model', False) == 'account.account' and view_id: if context.get('active_model', False) == 'account.account' and view_id:
doc = etree.XML(res['arch']) doc = etree.XML(res['arch'])

48
addons/account/wizard/account_report_common_view.xml
View File

@ -7,32 +7,36 @@
<field name="model">account.common.report</field> <field name="model">account.common.report</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Report Options"> <form string="Report Options" version="7.0">
<label nolabel="1" string=""/> <header>
<newline/> <button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" />
<button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/>
</header>
<label string=""/> <!-- binding for inherited views -->
<group col="4">
<field name="chart_account_id" widget='selection' on_change="onchange_chart_id(chart_account_id, context)"/> <field name="chart_account_id" widget='selection' on_change="onchange_chart_id(chart_account_id, context)"/>
<field name="company_id" invisible="1"/> <field name="company_id" invisible="1"/>
<field name="fiscalyear_id" domain="[('company_id','=',company_id)]"/> <field name="fiscalyear_id" domain="[('company_id','=',company_id)]"/>
<field name="target_move"/> <field name="target_move"/>
<notebook tabpos="up" colspan="4"> </group>
<page string="Filters" name="filters"> <notebook tabpos="up" colspan="4">
<field name="filter" on_change="onchange_filter(filter, fiscalyear_id)" colspan="4"/> <page string="Filters" name="filters">
<separator string="Dates" colspan="4"/> <group col="4">
<field name="date_from" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/> <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)"/>
<field name="date_to" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/> </group>
<separator string="Periods" colspan="4"/> <group string="Dates" col="4">
<field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/> <field name="date_from" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
<field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/> <field name="date_to" attrs="{'readonly':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}" colspan="4"/>
</page> </group>
<page string="Journals" name="journal_ids"> <group string="Periods" col="4">
<field name="journal_ids" colspan="4" nolabel="1"/> <field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
</page> <field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]" attrs="{'readonly':[('filter','!=','filter_period')], 'required':[('filter', '=', 'filter_period')]}" colspan="4"/>
</notebook> </group>
<separator colspan="4"/> </page>
<group col="4" colspan="4"> <page string="Journals" name="journal_ids">
<button icon="gtk-cancel" special="cancel" string="Cancel" colspan="2"/> <field name="journal_ids"/>
<button icon="gtk-print" name="check_report" string="Print" type="object" colspan="2" default_focus="1" /> </page>
</group> </notebook>
</form> </form>
</field> </field>
</record> </record>

14
addons/account/wizard/account_state_open_view.xml
View File

@ -7,15 +7,13 @@
<field name="model">account.state.open</field> <field name="model">account.state.open</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Open Invoice"> <form string="Open Invoice" version="7.0">
<label string="Are you sure you want to open this invoice ?"/> <header>
<newline/>
<label string="(Invoice should be unreconciled if you want to open it)"/>
<separator colspan="4"/>
<group colspan="2" col="4">
<button special="cancel" string="No" icon="terp-gtk-stop"/>
<button name="change_inv_state" string="Yes" type="object" icon="terp-camera_test"/> <button name="change_inv_state" string="Yes" type="object" icon="terp-camera_test"/>
</group> <button special="cancel" string="No" icon="terp-gtk-stop"/>
</header>
<label string="Are you sure you want to open this invoice ?"/>
<label string="(Invoice should be unreconciled if you want to open it)"/>
</form> </form>
</field> </field>
</record> </record>

23
addons/account/wizard/account_subscription_generate_view.xml
View File

@ -7,18 +7,17 @@
<field name="model">account.subscription.generate</field> <field name="model">account.subscription.generate</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Subscription Compute"> <form string="Subscription Compute" version="7.0">
<separator string="Generate Entries before:" colspan="4"/> <header>
<label string ="Automatically generate entries based on what has been entered in the system before a specific date." colspan="4" nolabel="1"/> <button icon="gtk-cancel" special="cancel" string="Cancel" />
<newline/> <button icon="gtk-execute" string="Generate Entries"
<field name="date"/> name="action_generate" type="object" />
<separator colspan="4" /> </header>
<group colspan="4" col="6"> <separator string="Generate Entries before:"/>
<label string ="" colspan="2"/> <label string ="Automatically generate entries based on what has been entered in the system before a specific date."/>
<button icon="gtk-cancel" special="cancel" string="Cancel" /> <group>
<button icon="gtk-execute" string="Generate Entries" <field name="date"/>
name="action_generate" type="object" /> </group>
</group>
</form> </form>
</field> </field>
</record> </record>

18
addons/account/wizard/account_tax_chart_view.xml
View File

@ -7,17 +7,15 @@
<field name="model">account.tax.chart</field> <field name="model">account.tax.chart</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Account tax charts"> <form string="Account tax charts" version="7.0">
<group colspan="4" > <header>
<field name="period_id"/>
<label align="0.7" colspan="6" string="(If you do not select period it will take all open periods)"/>
<field name="target_move"/>
</group>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel" />
<button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_tax_chart_open_window" type="object" /> <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_tax_chart_open_window" type="object" />
<button icon="gtk-cancel" special="cancel" string="Cancel" />
</header>
<group>
<field name="period_id"/>
<label colspan="4" string="(If you do not select period it will take all open periods)"/>
<field name="target_move"/>
</group> </group>
</form> </form>
</field> </field>

36
addons/account/wizard/account_unreconcile_view.xml
View File

@ -7,16 +7,14 @@
<field name="model">account.unreconcile</field> <field name="model">account.unreconcile</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Unreconciliation"> <form string="Unreconciliation" version="7.0">
<separator string="Unreconciliate Transactions" colspan="4"/> <header>
<image name="terp-referer"/> <button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1"/>
<label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled" colspan="2"/> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
<separator colspan="4"/> </header>
<group colspan="4" col="6"> <separator string="Unreconciliate Transactions"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"/>
<button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1"/> </form>
</group>
</form>
</field> </field>
</record> </record>
@ -43,16 +41,14 @@
<field name="model">account.unreconcile.reconcile</field> <field name="model">account.unreconcile.reconcile</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Unreconciliation"> <form string="Unreconciliation" version="7.0">
<separator string="Unreconciliation Transactions" colspan="4"/> <header>
<image name="gtk-dialog-info"/> <button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1"/>
<label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
<separator colspan="4"/> </header>
<group colspan="4" col="6"> <separator string="Unreconciliation Transactions"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
<button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1"/> </form>
</group>
</form>
</field> </field>
</record> </record>

30
addons/account/wizard/account_use_model_view.xml
View File

@ -7,15 +7,16 @@
<field name="model">account.use.model</field> <field name="model">account.use.model</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Create Entries From Models"> <form string="Create Entries From Models" version="7.0">
<separator string="This wizard will create recurring accounting entries" colspan="4"/> <header>
<label string="Create manual recurring entries in a chosen journal." width="400"/> <button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/>
<field name="model" colspan="4" nolabel="1"/> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
<separator colspan="4"/> </header>
<group colspan="4" col="2"> <separator string="This wizard will create recurring accounting entries"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <label string="Create manual recurring entries in a chosen journal."/>
<button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/> <group>
</group> <field name="model"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -37,11 +38,12 @@
<field name="model">account.use.model</field> <field name="model">account.use.model</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Use Model"> <form string="Use Model" version="7.0">
<label string = "Are you sure you want to create entries?" colspan="2"/> <header>
<newline/> <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/> </header>
<label string = "Are you sure you want to create entries?"/>
</form> </form>
</field> </field>
</record> </record>

32
addons/account/wizard/account_validate_move_view.xml
View File

@ -8,17 +8,17 @@
<field name="model">validate.account.move</field> <field name="model">validate.account.move</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Post Journal Entries"> <form string="Post Journal Entries" version="7.0">
<separator string="Post Journal Entries of a Journal" colspan="4"/> <header>
<label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore." colspan="4"/>
<field name="journal_id"/>
<newline/>
<field name="period_id"/>
<separator colspan="4"/>
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-camera_test" string="Approve" name="validate_move" type="object"/> <button icon="terp-camera_test" string="Approve" name="validate_move" type="object"/>
</group> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
</header>
<separator string="Post Journal Entries of a Journal"/>
<label string="All draft account entries in this journal and period will be validated. It means you won't be able to modify their accounting fields anymore."/>
<group>
<field name="journal_id"/>
<field name="period_id"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -46,15 +46,13 @@
<field name="model">validate.account.move.lines</field> <field name="model">validate.account.move.lines</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Post Journal Entries"> <form string="Post Journal Entries" version="7.0">
<separator string="Post Journal Entries" colspan="4"/> <header>
<image name="terp-referer"/>
<label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore." colspan="2"/>
<separator colspan="4"/>
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-camera_test" string="Approve" name="validate_move_lines" type="object" default_focus="1"/> <button icon="terp-camera_test" string="Approve" name="validate_move_lines" type="object" default_focus="1"/>
</group> </header>
<separator string="Post Journal Entries"/>
<label string="All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore." colspan="2"/>
</form> </form>
</field> </field>
</record> </record>

28
addons/account/wizard/account_vat_view.xml
View File

@ -7,20 +7,22 @@
<field name="model">account.vat.declaration</field> <field name="model">account.vat.declaration</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Taxes Report"> <form string="Taxes Report" version="7.0">
<separator string="Taxes Report" colspan="4"/> <header>
<label colspan="4" nolabel="1" string="This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/> <button name="create_vat" string="Print Tax Statement" type="object" icon="gtk-ok"/>
<newline/>
<field name="chart_tax_id" widget='selection'/>
<field name="fiscalyear_id"/>
<field name="display_detail"/>
<!--- <field name="based_on"/>--> <!-- the option based_on 'payment' is probably not fully compliant with what the users understand with that term. So, currently, it's seems better to remove it from the view to avoid further problems -->
<separator string="Periods" colspan="4"/>
<field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
<field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
<group col="2" colspan="4">
<button icon='gtk-cancel' special="cancel" string="Cancel" /> <button icon='gtk-cancel' special="cancel" string="Cancel" />
<button name="create_vat" string="Print Tax Statement" colspan="1" type="object" icon="gtk-ok"/> </header>
<label colspan="4" string="This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
<group string="Taxes Report" col="4">
<field name="chart_tax_id" widget='selection'/>
<field name="fiscalyear_id"/>
<field name="display_detail"/>
<!--- <field name="based_on"/>--> <!-- the option based_on 'payment' is probably not fully compliant with what the users understand with that term. So, currently, it's seems better to remove it from the view to avoid further problems -->
</group>
<group string="Periods" col="4">
<field name="period_from" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
<field name="period_to" domain="[('fiscalyear_id', '=', fiscalyear_id)]"/>
</group> </group>
</form> </form>
</field> </field>

12
addons/account_analytic_analysis/i18n/ja.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n" "Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-04-18 05:50+0000\n" "PO-Revision-Date: 2012-06-12 00:29+0000\n"
"Last-Translator: Akira Hiyama <Unknown>\n" "Last-Translator: Akira Hiyama <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n" "Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-04-19 04:38+0000\n" "X-Launchpad-Export-Date: 2012-06-12 04:55+0000\n"
"X-Generator: Launchpad (build 15108)\n" "X-Generator: Launchpad (build 15389)\n"
#. module: account_analytic_analysis #. module: account_analytic_analysis
#: field:account.analytic.account,revenue_per_hour:0 #: field:account.analytic.account,revenue_per_hour:0
@ -159,7 +159,7 @@ msgstr "残り時間"
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue
#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue
msgid "Contracts to Renew" msgid "Contracts to Renew"
msgstr "更新する契約" msgstr "更新契約"
#. module: account_analytic_analysis #. module: account_analytic_analysis
#: field:account.analytic.account,theorical_margin:0 #: field:account.analytic.account,theorical_margin:0
@ -182,7 +182,7 @@ msgstr "全てのそれらのコストが価格表によって提供される通
#. module: account_analytic_analysis #. module: account_analytic_analysis
#: view:account.analytic.account:0 #: view:account.analytic.account:0
msgid "Pending" msgid "Pending"
msgstr "保留中" msgstr "保留"
#. module: account_analytic_analysis #. module: account_analytic_analysis
#: field:account.analytic.account,ca_to_invoice:0 #: field:account.analytic.account,ca_to_invoice:0
@ -253,7 +253,7 @@ msgstr "月別時間数合計"
#. module: account_analytic_analysis #. module: account_analytic_analysis
#: constraint:account.analytic.account:0 #: constraint:account.analytic.account:0
msgid "Error! You can not create recursive analytic accounts." msgid "Error! You can not create recursive analytic accounts."
msgstr "エラー。反復した分析アカウントを作ることはできません" msgstr "エラー。再帰的な分析アカウントを作ることはできません。"
#. module: account_analytic_analysis #. module: account_analytic_analysis
#: field:account.analytic.account,remaining_ca:0 #: field:account.analytic.account,remaining_ca:0

22
addons/account_analytic_default/account_analytic_default_view.xml
View File

@ -24,16 +24,18 @@
<field name="model">account.analytic.default</field> <field name="model">account.analytic.default</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Analytic Defaults"> <form string="Analytic Defaults" version="7.0">
<field name="analytic_id" required="1" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/> <group col="4">
<field name="sequence"/> <field name="analytic_id" required="1" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
<separator string="Conditions" colspan="4"/> <field name="sequence"/>
<field name="product_id"/> <separator string="Conditions" colspan="4"/>
<field name="partner_id"/> <field name="product_id"/>
<field name="user_id"/> <field name="partner_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="user_id"/>
<field name="date_start"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="date_stop"/> <field name="date_start"/>
<field name="date_stop"/>
</group>
</form> </form>
</field> </field>
</record> </record>

2
addons/account_analytic_plans/account_analytic_plans.py
View File

@ -82,7 +82,7 @@ class account_analytic_plan_line(osv.osv):
_description = "Analytic Plan Line" _description = "Analytic Plan Line"
_order = "sequence, id" _order = "sequence, id"
_columns = { _columns = {
'plan_id': fields.many2one('account.analytic.plan','Analytic Plan'), 'plan_id': fields.many2one('account.analytic.plan','Analytic Plan',required=True),
'name': fields.char('Plan Name', size=64, required=True, select=True), 'name': fields.char('Plan Name', size=64, required=True, select=True),
'sequence': fields.integer('Sequence'), 'sequence': fields.integer('Sequence'),
'root_analytic_id': fields.many2one('account.analytic.account', 'Root Account', help="Root account of this plan.", required=False), 'root_analytic_id': fields.many2one('account.analytic.account', 'Root Account', help="Root account of this plan.", required=False),

78
addons/account_analytic_plans/account_analytic_plans_view.xml
View File

@ -22,10 +22,10 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="account.view_move_form"/> <field name="inherit_id" ref="account.view_move_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='line_id']/tree/field[@name='analytic_account_id']" position="replace"> <xpath expr="/form/sheet/notebook/page/field[@name='line_id']/tree/field[@name='analytic_account_id']" position="replace">
<field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/> <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
</xpath> </xpath>
<xpath expr="/form/notebook/page/field[@name='line_id']/form/notebook/page/group/field[@name='analytic_account_id']" position="replace"> <xpath expr="/form/sheet/notebook/page/field[@name='line_id']/form/notebook/page/group/group/field[@name='analytic_account_id']" position="replace">
<field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/> <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
</xpath> </xpath>
</field> </field>
@ -111,20 +111,22 @@
<field name="model">account.analytic.plan.instance</field> <field name="model">account.analytic.plan.instance</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Analytic Distribution"> <form string="Analytic Distribution" version="7.0">
<field name="name" select="1"/> <group col="4">
<field name="code" select="1"/> <field name="name"/>
<field name="plan_id" required="True"/> <field name="code"/>
<field name="journal_id"/> <field name="plan_id"/>
<field name="account_ids" nolabel="1" colspan="4"> <field name="journal_id"/>
<form string="Analytic Distribution"> </group>
<field name="rate"/> <field name="account_ids">
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
</form>
<tree string="Analytic Distribution" editable="bottom"> <tree string="Analytic Distribution" editable="bottom">
<field name="rate"/> <field name="rate"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/> <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
</tree> </tree>
<form string="Analytic Distribution" version="7.0">
<field name="rate"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
</form>
</field> </field>
</form> </form>
</field> </field>
@ -136,8 +138,8 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Analytic Distribution"> <tree string="Analytic Distribution">
<field name="name" select="1"/> <field name="name"/>
<field name="code" select="1"/> <field name="code"/>
<field name="plan_id"/> <field name="plan_id"/>
<field name="journal_id"/> <field name="journal_id"/>
</tree> </tree>
@ -165,10 +167,12 @@
<field name="model">account.analytic.plan.instance.line</field> <field name="model">account.analytic.plan.instance.line</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Analytic Distribution Line"> <form string="Analytic Distribution Line" version="7.0">
<field name="plan_id"/> <group col="4">
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/> <field name="plan_id"/>
<field name="rate"/> <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="rate"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -179,8 +183,8 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Analytic Distribution Lines"> <tree string="Analytic Distribution Lines">
<field name="plan_id" select="1"/> <field name="plan_id"/>
<field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/> <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="rate"/> <field name="rate"/>
</tree> </tree>
</field> </field>
@ -202,10 +206,12 @@
<field name="model">account.analytic.plan</field> <field name="model">account.analytic.plan</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Analytic Plan"> <form string="Analytic Plan" version="7.0">
<field name="name"/> <group col="4">
<field name="default_instance_id"/> <field name="name"/>
<field name="plan_ids" colspan="4" nolabel="1"/> <field name="default_instance_id"/>
</group>
<field name="plan_ids"/>
</form> </form>
</field> </field>
</record> </record>
@ -246,13 +252,15 @@
<field name="model">account.analytic.plan.line</field> <field name="model">account.analytic.plan.line</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Analytic Plan Line"> <form string="Analytic Plan Line" version="7.0">
<field name="name"/> <group col="4">
<field name="sequence"/> <field name="name"/>
<field name="root_analytic_id" groups="analytic.group_analytic_accounting"/> <field name="sequence"/>
<newline/> <field name="root_analytic_id" groups="analytic.group_analytic_accounting"/>
<field name="min_required"/> <newline/>
<field name="max_required"/> <field name="min_required"/>
<field name="max_required"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -263,7 +271,7 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Analytic Plan Lines"> <tree string="Analytic Plan Lines">
<field name="name" select="1"/> <field name="name"/>
<field name="sequence"/> <field name="sequence"/>
<field name="root_analytic_id" groups="analytic.group_analytic_accounting"/> <field name="root_analytic_id" groups="analytic.group_analytic_accounting"/>
<field name="min_required"/> <field name="min_required"/>
@ -281,7 +289,7 @@
<field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_form"/> <field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="analytic_id" required="1" position="replace"> <field name="analytic_id" required="1" position="replace">
<field name="analytics_id" select="1" required="1"/> <field name="analytics_id" required="1"/>
</field> </field>
</field> </field>
</record> </record>
@ -292,7 +300,7 @@
<field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_tree"/> <field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_tree"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="analytic_id" required="1" position="replace"> <field name="analytic_id" required="1" position="replace">
<field name="analytics_id" select="1" required="1"/> <field name="analytics_id" required="1"/>
</field> </field>
</field> </field>
</record> </record>
@ -306,7 +314,7 @@
<xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/tree/field[@name='analytic_account_id']" position="replace"> <xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/tree/field[@name='analytic_account_id']" position="replace">
<field name="analytics_id" groups="analytic.group_analytic_accounting"/> <field name="analytics_id" groups="analytic.group_analytic_accounting"/>
</xpath> </xpath>
<xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/form/field[@name='analytic_account_id']" position="replace"> <xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/form/group/field[@name='analytic_account_id']" position="replace">
<field name="analytics_id" groups="analytic.group_analytic_accounting"/> <field name="analytics_id" groups="analytic.group_analytic_accounting"/>
</xpath> </xpath>
</field> </field>

35
addons/account_analytic_plans/wizard/account_crossovered_analytic_view.xml
View File

@ -2,26 +2,25 @@
<openerp> <openerp>
<data> <data>
<record id="view_account_crossovered_analytic" model="ir.ui.view"> <record id="view_account_crossovered_analytic" model="ir.ui.view">
<field name="name">account.crossovered.analytic.form</field> <field name="name">account.crossovered.analytic.form</field>
<field name="model">account.crossovered.analytic</field> <field name="model">account.crossovered.analytic</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Crossovered Analytic"> <form string="Crossovered Analytic" version="7.0">
<group col="4" colspan="6"> <header>
<field name="date1"/> <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
<field name="date2"/> <button special="cancel" string="Cancel" icon='gtk-cancel'/>
<field name="ref" groups="analytic.group_analytic_accounting"/> </header>
<field name="empty_line"/> <group col="4">
<separator colspan="4" string="Analytic Journal"/> <field name="date1"/>
<field name="journal_ids" colspan="4" nolabel="1"/> <field name="date2"/>
</group> <field name="ref" groups="analytic.group_analytic_accounting"/>
<separator colspan="4"/> <field name="empty_line"/>
<group col="2" colspan="4"> </group><group string="Analytic Journal">
<button special="cancel" string="Cancel" icon='gtk-cancel'/> <field name="journal_ids" colspan="2" nolabel="1"/>
<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/> </group>
</group> </form>
</form>
</field> </field>
</record> </record>
@ -34,7 +33,7 @@
<field name="target">new</field> <field name="target">new</field>
</record> </record>
<record model="ir.values" id="account_crossovered_analytic_values"> <record model="ir.values" id="account_crossovered_analytic_values">
<field name="model_id" ref="analytic.model_account_analytic_account" /> <field name="model_id" ref="analytic.model_account_analytic_account" />
<field name="name">Crossovered Analytic</field> <field name="name">Crossovered Analytic</field>
<field name="key2">client_print_multi</field> <field name="key2">client_print_multi</field>
@ -43,5 +42,5 @@
<field name="model">account.analytic.account</field> <field name="model">account.analytic.account</field>
</record> </record>
</data> </data>
</openerp> </openerp>

42
addons/account_analytic_plans/wizard/analytic_plan_create_model_view.xml
View File

@ -1,40 +1,32 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<record id="view_analytic_plan_create_model_msg" model="ir.ui.view"> <record id="view_analytic_plan_create_model_msg" model="ir.ui.view">
<field name="name">analytic.plan.create.model.msg.form</field> <field name="name">analytic.plan.create.model.msg.form</field>
<field name="model">analytic.plan.create.model</field> <field name="model">analytic.plan.create.model</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Distribution Model Saved"> <form string="Distribution Model Saved" version="7.0">
<group col="4" colspan="6"> <header>
<label string="Save This Distribution as a Model"/> <button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1"/>
<newline/> <button special="cancel" string="Cancel" icon='gtk-ok' />
</group> </header>
<separator colspan="4"/> <label string="Save This Distribution as a Model"/>
<group col="2" colspan="4"> </form>
<button special="cancel" string="Cancel" icon='gtk-ok' />
<button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1"/>
</group>
</form>
</field> </field>
</record> </record>
<record id="view_analytic_plan_create_model" model="ir.ui.view"> <record id="view_analytic_plan_create_model" model="ir.ui.view">
<field name="name">analytic.plan.create.model.form</field> <field name="name">analytic.plan.create.model.form</field>
<field name="model">analytic.plan.create.model</field> <field name="model">analytic.plan.create.model</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Distribution Model Saved"> <form string="Distribution Model Saved" version="7.0">
<group col="4" colspan="6"> <header>
<label string="This distribution model has been saved.You will be able to reuse it later."/> <button special="cancel" string="Ok" icon='gtk-ok'/>
<newline/> </header>
</group> <label string="This distribution model has been saved.You will be able to reuse it later."/>
<separator colspan="4"/> </form>
<group col="2" colspan="4">
<button special="cancel" string="Ok" icon='gtk-ok'/>
</group>
</form>
</field> </field>
</record> </record>
@ -49,5 +41,5 @@
<field name="view_id" ref="view_analytic_plan_create_model_msg"/> <field name="view_id" ref="view_analytic_plan_create_model_msg"/>
</record> </record>
</data> </data>
</openerp> </openerp>

6
addons/account_anglo_saxon/product_view.xml
View File

@ -35,9 +35,9 @@
<field name="inherit_id" ref="product.product_category_form_view"/> <field name="inherit_id" ref="product.product_category_form_view"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form position="inside"> <form position="inside">
<group col="2" colspan="2"> <group>
<separator string=" Accounting Property" colspan="2"/> <separator string="Accounting Property" colspan="2"/>
<field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/> <field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
</group> </group>
</form> </form>
</field> </field>

230
addons/account_asset/account_asset_view.xml
View File

@ -10,35 +10,36 @@
<field name="model">account.asset.category</field> <field name="model">account.asset.category</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Asset category"> <form string="Asset category" version="7.0">
<field name="name"/> <group>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <group>
<separator string="Accounting Information" colspan="4"/> <field name="name"/>
<field name="journal_id"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="account_asset_id" on_change="onchange_account_asset(account_asset_id)"/> </group>
<field name="account_depreciation_id"/> <group>
<field name="account_expense_depreciation_id"/> <field name="journal_id"/>
<group colspan="2" col="2"> <field name="account_asset_id" on_change="onchange_account_asset(account_asset_id)"/>
<separator string="Depreciation Dates" colspan="2"/> <field name="account_depreciation_id"/>
<field name="method_time"/> <field name="account_expense_depreciation_id"/>
<field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/> </group>
<field name="method_period"/> <group string="Depreciation Dates">
<field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/> <field name="method_time"/>
<field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
<field name="method_period"/>
<field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
</group>
<group string="Depreciation Method">
<field name="method"/>
<field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
<field name="prorata"/>
<field name="open_asset"/>
</group>
<group groups="analytic.group_analytic_accounting" string="Analytic Information">
<field name="account_analytic_id"/>
</group>
</group> </group>
<group colspan="2" col="2"> <separator string="Notes"/>
<separator string="Depreciation Method" colspan="2"/> <field name="note"/>
<field name="method"/>
<field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
<field name="prorata"/>
<field name="open_asset"/>
</group>
<group col="2" colspan="2" groups="analytic.group_analytic_accounting">
<separator string="Analytic Information" colspan="4"/>
<newline/>
<field name="account_analytic_id"/>
</group>
<separator string="Notes" colspan="4"/>
<field name="note" colspan="4" nolabel="1"/>
</form> </form>
</field> </field>
</record> </record>
@ -78,75 +79,79 @@
<field name="model">account.asset.asset</field> <field name="model">account.asset.asset</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="Asset" version="7.0">
<div class="oe_form_topbar"> <header>
<button name="validate" states="draft" string="Confirm Asset" type="object"/> <button name="validate" states="draft" string="Confirm Asset" type="object"/>
<button name="set_to_close" states="open" string="Set to Close" type="object"/> <button name="set_to_close" states="open" string="Set to Close" type="object"/>
<button name="set_to_draft" states="open" string="Set to Draft" type="object"/> <button name="set_to_draft" states="open" string="Set to Draft" type="object"/>
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/> <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
</div> </header>
<sheet string="Asset" layout="auto"> <sheet>
<group col="6" colspan="4" class="oe_form_header"> <label for="name"/>
<field name="name"/> <h1><field name="name"/></h1>
<field name="category_id" on_change="onchange_category_id(category_id)"/> <label for="category_id"/>
<field name="code"/> <h2><field name="category_id" on_change="onchange_category_id(category_id)"/></h2>
<field name="purchase_value"/> <notebook colspan="4">
<field name="salvage_value"/> <page string="General">
<field name="value_residual"/> <group>
<field name="currency_id"/> <group>
<field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/> <field name="code"/>
</group> <field name="company_id" widget="selection"
<notebook colspan="4"> groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
<page string="General"> </group>
<separator string="Other Information" colspan="4"/> <group>
<field name="partner_id"/> <field name="purchase_value"/>
<field name="purchase_date"/> <field name="salvage_value"/>
<field name="parent_id"/> <field name="value_residual"/>
<newline/> <field name="currency_id"/>
<group colspan="2" col="2"> </group>
<separator string="Depreciation Dates" colspan="2"/> <group>
<field name="method_time" on_change="onchange_method_time(method_time)"/> <field name="partner_id"/>
<field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/> <field name="purchase_date"/>
<field name="method_period"/> <field name="parent_id"/>
<field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/> </group>
<newline/> <group>
<button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" colspan="2"/> <field name="method_time" on_change="onchange_method_time(method_time)"/>
</group> <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
<group colspan="2" col="2"> <field name="method_period"/>
<separator string="Depreciation Method" colspan="2"/> <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
<field name="method"/> <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" colspan="2"/>
<field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/> </group>
<field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/> <group>
</group> <field name="method"/>
</page> <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
<page string="Depreciation Board"> <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
<field name="depreciation_line_ids" colspan="4" nolabel="1" mode="tree,graph"> </group>
<tree string="Depreciation Lines" colors="blue:(move_check == False);black:(move_check == True)"> </group>
<field name="depreciation_date"/> </page>
<field name="sequence" invisible="1"/> <page string="Depreciation Board">
<field name="depreciated_value" readonly="1"/> <field name="depreciation_line_ids" mode="tree,graph">
<field name="amount"/> <tree string="Depreciation Lines" colors="blue:(move_check == False);black:(move_check == True)">
<field name="remaining_value" readonly="1"/> <field name="depreciation_date"/>
<field name="move_check"/> <field name="sequence" invisible="1"/>
<field name="parent_state" invisible="1"/> <field name="depreciated_value" readonly="1"/>
<button name="create_move" attrs="{'invisible':['|',('move_check','!=',False),('parent_state','!=','open')]}" icon="gtk-execute" string="Create Move" type="object"/> <field name="amount"/>
</tree> <field name="remaining_value" readonly="1"/>
<graph type="bar"> <field name="move_check"/>
<field name="name"/> <field name="parent_state" invisible="1"/>
<field name="amount"/> <button name="create_move" attrs="{'invisible':['|',('move_check','!=',False),('parent_state','!=','open')]}" icon="gtk-execute" string="Create Move" type="object"/>
<field name="depreciated_value"/> </tree>
</graph> <graph type="bar">
</field> <field name="name"/>
<button type="object" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2" attrs="{'invisible':[('state','=','close')]}"/> <field name="amount"/>
</page> <field name="depreciated_value"/>
<page string="History"> </graph>
<field name="account_move_line_ids" colspan="4" nolabel="1" readonly="1"/> </field>
<field name="history_ids" colspan="4" nolabel="1" readonly="1"/> <button type="object" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2" attrs="{'invisible':[('state','=','close')]}"/>
</page> </page>
<page string="Notes"> <page string="History">
<field name="note" nolabel="1"/> <field name="account_move_line_ids" readonly="1"/>
</page> <field name="history_ids" readonly="1"/>
</notebook> </page>
<page string="Notes">
<field name="note"/>
</page>
</notebook>
</sheet> </sheet>
</form> </form>
</field> </field>
@ -220,21 +225,22 @@
<field name="model">account.asset.history</field> <field name="model">account.asset.history</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Asset history"> <form string="Asset History" version="7.0">
<group col="6" colspan="4"> <group>
<field name="name"/> <group>
<field name="date"/> <field name="name"/>
<field name="user_id"/> <field name="date"/>
</group> <field name="user_id"/>
<group col="2" colspan="2"> </group>
<separator string="Depreciation Dates" colspan="2"/> <group>
<field name="method_time"/> <field name="method_time"/>
<field name="method_number" attrs="{'invisible':[('method_time','=','end')]}"/> <field name="method_number" attrs="{'invisible':[('method_time','=','end')]}"/>
<field name="method_period"/> <field name="method_period"/>
<field name="method_end" attrs="{'invisible':[('method_time','=','number')]}"/> <field name="method_end" attrs="{'invisible':[('method_time','=','number')]}"/>
</group> </group>
<separator string="Notes" colspan="4"/> </group>
<field name="note" colspan="4" nolabel="1"/> <separator string="Notes"/>
<field name="note"/>
</form> </form>
</field> </field>
</record> </record>

21
addons/account_asset/wizard/account_asset_change_duration_view.xml
View File

@ -7,26 +7,21 @@
<field name="model">asset.modify</field> <field name="model">asset.modify</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Modify Asset"> <form string="Modify Asset" version="7.0">
<group colspan="4" col="4"> <header>
<separator string="Asset Durations to Modify" colspan="4"/> <button name="modify" string="Modify" type="object" icon="terp-camera_test"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
</header>
<group string="Asset Durations to Modify" col="4">
<field name="name" colspan="4"/> <field name="name" colspan="4"/>
<group colspan="2" col="2"> <group colspan="2" col="2">
<field name="method_number"/> <field name="method_number"/>
<field name="method_end"/> <field name="method_end"/>
</group> </group>
<field name="method_period"/> <field name="method_period"/>
<separator string="Notes" colspan="4"/>
<field name="note" nolabel="1" colspan="4"/>
</group>
<newline/>
<group colspan="4" col="4">
<separator string ="" colspan="4"/>
<newline/>
<group colspan="2" col="2"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="modify" string="Modify" type="object" icon="terp-camera_test"/>
</group> </group>
<separator string="Notes"/>
<field name="note"/>
</form> </form>
</field> </field>
</record> </record>

23
addons/account_asset/wizard/wizard_asset_compute_view.xml
View File

@ -6,19 +6,18 @@
<field name="model">asset.depreciation.confirmation.wizard</field> <field name="model">asset.depreciation.confirmation.wizard</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Compute Asset"> <form string="Compute Asset" version="7.0">
<separator string="Post Depreciation Lines" colspan="4"/> <header>
<label string="This wizard will post the depreciation lines of running assets that belong to the selected period." colspan="4"/> <button icon="gtk-execute" string="Compute" name="asset_compute" type="object"/>
<newline/> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
</header>
<separator string="Post Depreciation Lines"/>
<label string="This wizard will post the depreciation lines of running assets that belong to the selected period."/>
<group>
<field name="period_id"/> <field name="period_id"/>
<separator colspan="4"/> </group>
<group colspan="4" col="6"> </form>
<label string="" colspan="2"/> </field>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-execute" string="Compute" name="asset_compute" type="object"/>
</group>
</form>
</field>
</record> </record>
<record id="action_asset_depreciation_confirmation_wizard" model="ir.actions.act_window"> <record id="action_asset_depreciation_confirmation_wizard" model="ir.actions.act_window">

82
addons/account_bank_statement_extensions/account_bank_statement_view.xml
View File

@ -9,26 +9,28 @@
<field name="model">account.bank.statement.line.global</field> <field name="model">account.bank.statement.line.global</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Batch Payment Info"> <form string="Batch Payment Info" version="7.0">
<field name="name"/> <group col="4">
<field name="amount"/> <field name="name"/>
<field name="code"/> <field name="amount"/>
<field name="parent_id"/> <field name="code"/>
<field name="type"/> <field name="parent_id"/>
<notebook colspan="4"> <field name="type"/>
<page string="Transactions"> </group>
<field colspan="4" name="bank_statement_line_ids" nolabel="1"/> <notebook>
</page> <page string="Transactions">
<page string="Child Batch Payments"> <field name="bank_statement_line_ids"/>
<field colspan="4" name="child_ids" nolabel="1"> </page>
<tree string="Child Batch Payments"> <page string="Child Batch Payments">
<field name="name"/> <field name="child_ids">
<field name="amount"/> <tree string="Child Batch Payments">
<field name="code"/> <field name="name"/>
</tree> <field name="amount"/>
</field> <field name="code"/>
</page> </tree>
</notebook> </field>
</page>
</notebook>
</form> </form>
</field> </field>
</record> </record>
@ -49,10 +51,10 @@
<field name="globalisation_id" string="Glob. Id"/> <field name="globalisation_id" string="Glob. Id"/>
<field name="state" invisible="1"/> <field name="state" invisible="1"/>
</xpath> </xpath>
<xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='date']" position="after"> <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/group/field[@name='date']" position="after">
<field name="val_date"/> <field name="val_date"/>
</xpath> </xpath>
<xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='amount']" position="after"> <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/group/field[@name='amount']" position="after">
<field name="globalisation_id"/> <field name="globalisation_id"/>
<field name="state" invisible="1"/> <field name="state" invisible="1"/>
</xpath> </xpath>
@ -92,23 +94,25 @@
<field name="model">account.bank.statement.line</field> <field name="model">account.bank.statement.line</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Statement Line"> <form string="Statement Line" version="7.0">
<field name="statement_id"/> <group col="4">
<field name="journal_id"/> <field name="statement_id"/>
<field name="date"/> <field name="journal_id"/>
<field name="val_date"/> <field name="date"/>
<field name="name"/> <field name="val_date"/>
<field name="ref" readonly="0"/> <field name="name"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/> <field name="ref" readonly="0"/>
<field name="type" on_change="onchange_type(partner_id, type)"/> <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/> <field name="type" on_change="onchange_type(partner_id, type)"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/> <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
<field name="amount"/> <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
<field name="globalisation_id"/> <field name="amount"/>
<field name="sequence" readonly="0"/> <field name="globalisation_id"/>
<field name="state"/> <field name="sequence" readonly="0"/>
<separator colspan="4" string="Notes"/> <field name="state"/>
<field colspan="4" name="note" nolabel="1"/> </group>
<separator string="Notes"/>
<field name="note"/>
</form> </form>
</field> </field>
</record> </record>

15
addons/account_bank_statement_extensions/wizard/cancel_statement_line_wizard.xml
View File

@ -9,16 +9,11 @@
<field name="model">cancel.statement.line</field> <field name="model">cancel.statement.line</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Cancel selected statement lines"> <form string="Cancel selected statement lines" version="7.0">
<label string="" colspan="4"/> <header>
<label colspan="4" string="Are you sure you want to cancel the selected Bank Statement lines ?"/> <button icon="gtk-execute" string="Cancel Lines" name="cancel_lines" type="object"/>
<label string="" colspan="4"/> </header>
<separator colspan="4"/> <label string="Are you sure you want to cancel the selected Bank Statement lines ?"/>
<group>
<label string="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-execute" string="Cancel Lines" name="cancel_lines" type="object"/>
</group>
</form> </form>
</field> </field>
</record> </record>

18
addons/account_bank_statement_extensions/wizard/confirm_statement_line_wizard.xml
View File

@ -9,17 +9,13 @@
<field name="model">confirm.statement.line</field> <field name="model">confirm.statement.line</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Confirm selected statement lines"> <form string="Confirm selected statement lines" version="7.0">
<label string="" colspan="4"/> <header>
<label colspan="4" string="Are you sure you want to confirm the selected Bank Statement lines ?"/> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
<label colspan="4" string="Confirmed lines cannot be changed anymore."/> <button icon="gtk-execute" string="Confirm Lines" name="confirm_lines" type="object"/>
<label string="" colspan="4"/> </header>
<separator colspan="4"/> <label string="Are you sure you want to confirm the selected Bank Statement lines ?"/>
<group> <label string="Confirmed lines cannot be changed anymore."/>
<label string="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-execute" string="Confirm Lines" name="confirm_lines" type="object"/>
</group>
</form> </form>
</field> </field>
</record> </record>

98
addons/account_budget/account_budget_view.xml
View File

@ -55,16 +55,18 @@
<field name="model">account.budget.post</field> <field name="model">account.budget.post</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Budgetary Position"> <form string="Budgetary Position" version="7.0">
<field name="name" select="1"/> <group col="4">
<field name="code" select="1"/> <field name="name"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="code"/>
<notebook colspan="4"> <field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<notebook>
<page string="Accounts"> <page string="Accounts">
<field name="account_ids" colspan="4" nolabel="1"/> <field name="account_ids"/>
</page> </page>
<page string="Budget Lines"> <page string="Budget Lines">
<field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="graph,tree"> <field name="crossovered_budget_line" widget="one2many_list" mode="graph,tree">
<graph type="bar" string="Lines"> <graph type="bar" string="Lines">
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/> <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="planned_amount" operator="+"/> <field name="planned_amount" operator="+"/>
@ -77,20 +79,22 @@
<field name="date_to"/> <field name="date_to"/>
<field name="paid_date"/> <field name="paid_date"/>
<field name="planned_amount" sum="Planned Amount"/> <field name="planned_amount" sum="Planned Amount"/>
<field name="practical_amount" select="1" sum="Practical Amount" /> <field name="practical_amount" sum="Practical Amount" />
<field name="theoritical_amount" sum="Theoretical Amount"/> <field name="theoritical_amount" sum="Theoretical Amount"/>
<field name="percentage"/> <field name="percentage"/>
</tree> </tree>
<form string="Budget Lines"> <form string="Budget Lines" version="7.0">
<field name="crossovered_budget_id"/> <group col="4">
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" /> <field name="crossovered_budget_id"/>
<field name="date_from"/> <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
<field name="date_to"/> <field name="date_from"/>
<field name="paid_date"/> <field name="date_to"/>
<field name="planned_amount"/> <field name="paid_date"/>
<field name="practical_amount" select="1"/> <field name="planned_amount"/>
<field name="theoritical_amount"/> <field name="practical_amount"/>
<field name="percentage"/> <field name="theoritical_amount"/>
<field name="percentage"/>
</group>
</form> </form>
</field> </field>
</page> </page>
@ -104,19 +108,19 @@
<field name="model">crossovered.budget</field> <field name="model">crossovered.budget</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 version="7.0">
<header> <header>
<button string="Confirm" name="confirm" states="draft" type="workflow" /> <button string="Confirm" name="confirm" states="draft" type="workflow" />
<button string="Approve" name="validate" states="confirm" type="workflow"/> <button string="Approve" name="validate" states="confirm" type="workflow"/>
<button string="Done" name="done" states="validate" type="workflow" /> <button string="Done" name="done" states="validate" type="workflow" />
<button name="draft" states="cancel" string="Reset to Draft" type="workflow"/> <button name="draft" states="cancel" string="Reset to Draft" type="workflow"/>
<button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/> <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
<field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/> <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
</header> </header>
<sheet string="Budget" layout="auto"> <sheet string="Budget">
<group class="oe_form_header"> <group col="4">
<field name="name" colspan="1" select="1" attrs="{'readonly':[('state','!=','draft')]}"/> <field name="name" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="code" colspan="1" select="1" attrs="{'readonly':[('state','!=','draft')]}"/> <field name="code" colspan="1" attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/> <field name="creating_user_id" attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="validating_user_id" readonly="True" attrs="{'readonly':[('state','!=','draft')]}"/> <field name="validating_user_id" readonly="True" attrs="{'readonly':[('state','!=','draft')]}"/>
<field name="date_from" attrs="{'readonly':[('state','!=','draft')]}"/> <field name="date_from" attrs="{'readonly':[('state','!=','draft')]}"/>
@ -134,17 +138,19 @@
<field name="theoritical_amount" sum="Theoretical Amount"/> <field name="theoritical_amount" sum="Theoretical Amount"/>
<field name="percentage"/> <field name="percentage"/>
</tree> </tree>
<form string="Budget Lines"> <form string="Budget Lines" version="7.0">
<field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/> <group col="4">
<field name="general_budget_id" select="1"/> <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="date_from"/> <field name="general_budget_id"/>
<field name="date_to"/> <field name="date_from"/>
<field name="paid_date" select="1"/> <field name="date_to"/>
<field name="planned_amount" select="1"/> <field name="paid_date"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="planned_amount"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</form> </form>
</field> </field>
</group> </group>
</sheet> </sheet>
</form> </form>
</field> </field>
@ -224,18 +230,20 @@
<field name="model">crossovered.budget.lines</field> <field name="model">crossovered.budget.lines</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Budget Lines"> <form string="Budget Lines" version="7.0">
<field name="crossovered_budget_id"/> <group col="4">
<field name="analytic_account_id"/> <field name="crossovered_budget_id"/>
<field name="general_budget_id"/> <field name="analytic_account_id"/>
<field name="date_from"/> <field name="general_budget_id"/>
<field name="date_to"/> <field name="date_from"/>
<field name="paid_date"/> <field name="date_to"/>
<field name="planned_amount"/> <field name="paid_date"/>
<field name="practical_amount"/> <field name="planned_amount"/>
<field name="theoritical_amount"/> <field name="practical_amount"/>
<field name="percentage"/> <field name="theoritical_amount"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="percentage"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</form> </form>
</field> </field>
</record> </record>

60
addons/account_budget/wizard/account_budget_analytic_view.xml
View File

@ -7,37 +7,37 @@
<field name="model">account.budget.analytic</field> <field name="model">account.budget.analytic</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select Dates Period"> <form string="Select Dates Period" version="7.0">
<separator string="This wizard is used to print budget" colspan="4"/> <header>
<field name="date_from"/> <button special="cancel" string="Cancel" icon="gtk-cancel"/>
<field name="date_to"/> <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
<separator colspan="4"/> </header>
<group colspan="4" col="6"> <group string="This wizard is used to print budget" col="4">
<button special="cancel" string="Cancel" icon="gtk-cancel"/> <field name="date_from"/>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/> <field name="date_to"/>
</group> </group>
</form> </form>
</field> </field>
</record> </record>
<record id="action_account_budget_analytic" model="ir.actions.act_window"> <record id="action_account_budget_analytic" model="ir.actions.act_window">
<field name="name">Print Budgets</field> <field name="name">Print Budgets</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">account.budget.analytic</field> <field name="res_model">account.budget.analytic</field>
<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="view_id" ref="account_budget_analytic_view"/> <field name="view_id" ref="account_budget_analytic_view"/>
<field name="target">new</field> <field name="target">new</field>
</record> </record>
<record model="ir.values" id="account_budget_analytic_values"> <record model="ir.values" id="account_budget_analytic_values">
<field name="model_id" ref="analytic.model_account_analytic_account" /> <field name="model_id" ref="analytic.model_account_analytic_account" />
<field name="name">Print Budgets</field> <field name="name">Print Budgets</field>
<field name="key2">client_print_multi</field> <field name="key2">client_print_multi</field>
<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_analytic'))" /> <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_analytic'))" />
<field name="key">action</field> <field name="key">action</field>
<field name="model">account.analytic.account</field> <field name="model">account.analytic.account</field>
</record> </record>
</data> </data>
</openerp> </openerp>

60
addons/account_budget/wizard/account_budget_crossovered_report_view.xml
View File

@ -7,35 +7,35 @@
<field name="model">account.budget.crossvered.report</field> <field name="model">account.budget.crossvered.report</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select Dates Period"> <form string="Select Dates Period" version="7.0">
<separator string="This wizard is used to print budget" colspan="4"/> <header>
<field name="date_from"/> <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
<field name="date_to"/> <button special="cancel" string="Cancel" icon="gtk-cancel"/>
<separator colspan="4"/> </header>
<group colspan="4" col="6"> <group string="This wizard is used to print budget" col="4">
<button special="cancel" string="Cancel" icon="gtk-cancel"/> <field name="date_from"/>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/> <field name="date_to"/>
</group> </group>
</form> </form>
</field> </field>
</record> </record>
<record id="action_account_budget_crossvered_report" model="ir.actions.act_window"> <record id="action_account_budget_crossvered_report" model="ir.actions.act_window">
<field name="name">Print Budgets</field> <field name="name">Print Budgets</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">account.budget.crossvered.report</field> <field name="res_model">account.budget.crossvered.report</field>
<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="view_id" ref="account_budget_crossvered_report_view"/> <field name="view_id" ref="account_budget_crossvered_report_view"/>
<field name="target">new</field> <field name="target">new</field>
</record> </record>
<record model="ir.values" id="account_budget_crossvered_report_values"> <record model="ir.values" id="account_budget_crossvered_report_values">
<field name="model_id" ref="account_budget.model_crossovered_budget" /> <field name="model_id" ref="account_budget.model_crossovered_budget" />
<field name="name">Print Budgets</field> <field name="name">Print Budgets</field>
<field name="key2">client_print_multi</field> <field name="key2">client_print_multi</field>
<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_crossvered_report'))" /> <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_crossvered_report'))" />
<field name="key">action</field> <field name="key">action</field>
<field name="model">crossovered.budget</field> <field name="model">crossovered.budget</field>
</record> </record>
</data> </data>
</openerp> </openerp>

60
addons/account_budget/wizard/account_budget_crossovered_summary_report_view.xml
View File

@ -7,36 +7,36 @@
<field name="model">account.budget.crossvered.summary.report</field> <field name="model">account.budget.crossvered.summary.report</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select Dates Period"> <form string="Select Dates Period" version="7.0">
<separator string="This wizard is used to print summary of budgets" colspan="4"/> <header>
<field name="date_from"/> <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
<field name="date_to"/> <button special="cancel" string="Cancel" icon="gtk-cancel"/>
<separator colspan="4"/> </header>
<group colspan="4" col="6"> <group string="This wizard is used to print summary of budgets">
<button special="cancel" string="Cancel" icon="gtk-cancel"/> <field name="date_from"/>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/> <field name="date_to"/>
</group> </group>
</form> </form>
</field> </field>
</record> </record>
<record id="action_account_budget_crossvered_summary_report" model="ir.actions.act_window"> <record id="action_account_budget_crossvered_summary_report" model="ir.actions.act_window">
<field name="name">Print Summary</field> <field name="name">Print Summary</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">account.budget.crossvered.summary.report</field> <field name="res_model">account.budget.crossvered.summary.report</field>
<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="view_id" ref="account_budget_crossvered_summary_report_view"/> <field name="view_id" ref="account_budget_crossvered_summary_report_view"/>
<field name="target">new</field> <field name="target">new</field>
</record> </record>
<record model="ir.values" id="account_budget_crossvered_summary_report_values"> <record model="ir.values" id="account_budget_crossvered_summary_report_values">
<field name="model_id" ref="account_budget.model_crossovered_budget" /> <field name="model_id" ref="account_budget.model_crossovered_budget" />
<field name="name">Print Summary</field> <field name="name">Print Summary</field>
<field name="key2">client_print_multi</field> <field name="key2">client_print_multi</field>
<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_crossvered_summary_report'))" /> <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_budget_crossvered_summary_report'))" />
<field name="key">action</field> <field name="key">action</field>
<field name="model">crossovered.budget</field> <field name="model">crossovered.budget</field>
</record> </record>
</data> </data>
</openerp> </openerp>

16
addons/account_budget/wizard/account_budget_report_view.xml
View File

@ -7,15 +7,15 @@
<field name="model">account.budget.report</field> <field name="model">account.budget.report</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select Dates Period"> <form string="Select Dates Period" version="7.0">
<separator string="Print Budgets" colspan="4"/> <header>
<field name="date_from"/>
<field name="date_to"/>
<separator colspan="4"/>
<group colspan="4" col="6">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/> <button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
</group> <button special="cancel" string="Cancel" icon="gtk-cancel"/>
</header>
<group string="Print Budgets" col="4">
<field name="date_from"/>
<field name="date_to"/>
</group>
</form> </form>
</field> </field>
</record> </record>

1
addons/account_check_writing/account_voucher.py
View File

@ -86,6 +86,7 @@ class account_voucher(osv.osv):
Add domain 'allow_check_writting = True' on journal_id field and remove 'widget = selection' on the same Add domain 'allow_check_writting = True' on journal_id field and remove 'widget = selection' on the same
field because the dynamic domain is not allowed on such widget field because the dynamic domain is not allowed on such widget
""" """
if not context: context = {}
res = super(account_voucher, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu) res = super(account_voucher, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
doc = etree.XML(res['arch']) doc = etree.XML(res['arch'])
nodes = doc.xpath("//field[@name='journal_id']") nodes = doc.xpath("//field[@name='journal_id']")

274
addons/account_coda/account_coda_view.xml
View File

@ -11,22 +11,22 @@
<field name="model">coda.bank.account</field> <field name="model">coda.bank.account</field>
<field name="type">search</field> <field name="type">search</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="CODA Bank Account Configuration"> <search string="CODA Bank Account Configuration">
<filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/> <filter string="Normal" domain="[('state','=','normal')]" icon="terp-folder-green"/>
<filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/> <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="name"/> <field name="name"/>
<field name="bank_id"/> <field name="bank_id"/>
<field name="description1"/> <field name="description1"/>
<field name="journal"/> <field name="journal"/>
<field name="currency" widget="selection"/> <field name="currency" widget="selection"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/>
<newline/> <newline/>
<group expand="0" string="Group By..."> <group expand="0" string="Group By...">
<filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/> <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/>
<filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/> <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/>
</group> </group>
</form> </search>
</field> </field>
</record> </record>
<record id="view_coda_bank_account_list" model="ir.ui.view"> <record id="view_coda_bank_account_list" model="ir.ui.view">
@ -35,11 +35,11 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="CODA Bank Account Configuration"> <tree string="CODA Bank Account Configuration">
<field name="name" select="1"/> <field name="name"/>
<field name="bank_id"/> <field name="bank_id"/>
<field name="currency"/> <field name="currency"/>
<field name="description1"/> <field name="description1"/>
<field name="journal" select="1"/> <field name="journal"/>
<field name="state"/> <field name="state"/>
</tree> </tree>
</field> </field>
@ -49,24 +49,26 @@
<field name="model">coda.bank.account</field> <field name="model">coda.bank.account</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="CODA Bank Account Configuration"> <form string="CODA Bank Account Configuration" version="7.0">
<field name="name" select="1" colspan="4"/> <group col="4">
<field name="bank_id" domain="[('partner_id.ref_companies', 'in', [company_id])]"/> <field name="name" colspan="4"/>
<field name="description1"/> <field name="bank_id" domain="[('partner_id.ref_companies', 'in', [company_id])]"/>
<field name="currency"/> <field name="description1"/>
<field name="description2"/> <field name="currency"/>
<field name="coda_st_naming"/> <field name="description2"/>
<field name="state" on_change="onchange_state(state)"/> <field name="coda_st_naming"/>
<field name="journal" attrs="{'invisible':[('state','=','info')]}"/> <field name="state" on_change="onchange_state(state)"/>
<newline/> <field name="journal" attrs="{'invisible':[('state','=','info')]}"/>
<field name="def_payable"/> <newline/>
<field name="def_receivable"/> <field name="def_payable"/>
<field name="awaiting_account"/> <field name="def_receivable"/>
<field name="transfer_account"/> <field name="awaiting_account"/>
<field name="find_bbacom"/> <field name="transfer_account"/>
<field name="find_partner"/> <field name="find_bbacom"/>
<field name="company_id" widget='selection' groups="base.group_multi_company"/> <field name="find_partner"/>
<field name="active"/> <field name="company_id" widget='selection' groups="base.group_multi_company"/>
<field name="active"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -97,11 +99,13 @@
<field name="model">account.coda.trans.type</field> <field name="model">account.coda.trans.type</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="CODA Transaction Type"> <form string="CODA Transaction Type" version="7.0">
<field name="type"/> <group col="4">
<field name="parent_id"/> <field name="type"/>
<field name="description" colspan="4"/> <field name="parent_id"/>
</form> <field name="description" colspan="4"/>
</group>
</form>
</field> </field>
</record> </record>
<record id="action_account_coda_trans_type_form" model="ir.actions.act_window"> <record id="action_account_coda_trans_type_form" model="ir.actions.act_window">
@ -132,13 +136,15 @@
<field name="model">account.coda.trans.code</field> <field name="model">account.coda.trans.code</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="CODA Transaction Code"> <form string="CODA Transaction Code" version="7.0">
<field name="code"/> <group col="4">
<field name="type"/> <field name="code"/>
<field name="parent_id"/> <field name="type"/>
<field name="description"/> <field name="parent_id"/>
<field name="comment" colspan="4"/> <field name="description"/>
</form> </group>
<field name="comment"/>
</form>
</field> </field>
</record> </record>
<record id="action_account_coda_trans_code_form" model="ir.actions.act_window"> <record id="action_account_coda_trans_code_form" model="ir.actions.act_window">
@ -167,10 +173,10 @@
<field name="model">account.coda.trans.category</field> <field name="model">account.coda.trans.category</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="CODA Transaction Category"> <form string="CODA Transaction Category" version="7.0">
<field name="category"/> <field name="category"/>
<field name="description"/> <field name="description"/>
</form> </form>
</field> </field>
</record> </record>
<record id="action_account_coda_trans_category_form" model="ir.actions.act_window"> <record id="action_account_coda_trans_category_form" model="ir.actions.act_window">
@ -199,10 +205,10 @@
<field name="model">account.coda.comm.type</field> <field name="model">account.coda.comm.type</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="CODA Structured Communication Type"> <form string="CODA Structured Communication Type" version="7.0">
<field name="code"/> <field name="code"/>
<field name="description"/> <field name="description"/>
</form> </form>
</field> </field>
</record> </record>
<record id="action_account_coda_comm_type_form" model="ir.actions.act_window"> <record id="action_account_coda_comm_type_form" model="ir.actions.act_window">
@ -239,19 +245,19 @@
<field name="model">account.coda</field> <field name="model">account.coda</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="CODA File"> <form string="CODA File" version="7.0">
<group colspan="4" col="6"> <group col="4">
<field name="coda_creation_date"/> <field name="coda_creation_date"/>
<field name="name"/> <field name="name"/>
<field name="coda_data" filename="name"/> <field name="coda_data" filename="name"/>
<field name="date"/> <field name="date"/>
<field name="user_id"/> <field name="user_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group> </group>
<separator colspan="4" string="Additional Information"/> <separator string="Additional Information"/>
<field name="note" nolabel="1" colspan="4" /> <field name="note"/>
<field name="statement_ids" nolabel="1" colspan="4"/> <field name="statement_ids"/>
</form> </form>
</field> </field>
</record> </record>
@ -315,55 +321,59 @@
<field name="model">coda.bank.statement</field> <field name="model">coda.bank.statement</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="CODA Bank Statement"> <form string="CODA Bank Statement" version="7.0">
<field name="name" select="1"/> <group col="4">
<field name="date" select="1"/>
<field name="coda_bank_account_id" select="1"/>
<field name="currency"/>
<field name="period_id" select="2"/>
<field name="type"/>
<newline/>
<field name="balance_start"/>
<field name="balance_end_real"/>
<notebook colspan="4">
<page string="Transactions">
<field colspan="4" name="line_ids" nolabel="1">
<tree string="CODA Statement Lines">
<field name="sequence" string="Seq"/>
<field name="date"/>
<field name="val_date"/>
<field name="ref"/>
<field name="name" width="250"/>
<field name="type"/>
<field name="partner_id"/>
<field name="account_id"/>
<field name="amount"/>
<field name="globalisation_amount" string="Glob. Amount"/>
<field name="globalisation_id" string="Glob. Id"/>
</tree>
<form string="CODA Statement Lines">
<field name="sequence" string="Seq"/>
<field name="date"/>
<field name="val_date"/>
<field name="name"/> <field name="name"/>
<field name="date"/>
<field name="coda_bank_account_id"/>
<field name="currency"/>
<field name="period_id"/>
<field name="type"/> <field name="type"/>
<field name="partner_id"/> <newline/>
<field domain="[('type', '&lt;&gt;', 'view')]" name="account_id"/> <field name="balance_start"/>
<field name="amount"/> <field name="balance_end_real"/>
<field name="ref"/> </group>
<field name="globalisation_amount"/> <notebook>
<field name="globalisation_level"/> <page string="Transactions">
<field name="globalisation_id"/> <field name="line_ids">
<separator colspan="4" string="Notes"/> <tree string="CODA Statement Lines">
<field colspan="4" name="note" nolabel="1"/> <field name="sequence" string="Seq"/>
</form> <field name="date"/>
</field> <field name="val_date"/>
</page> <field name="ref"/>
</notebook> <field name="name" width="250"/>
<group colspan="4"> <field name="type"/>
<field name="balance_end"/> <field name="partner_id"/>
</group> <field name="account_id"/>
</form> <field name="amount"/>
<field name="globalisation_amount" string="Glob. Amount"/>
<field name="globalisation_id" string="Glob. Id"/>
</tree>
<form string="CODA Statement Lines" version="7.0">
<group col="4">
<field name="sequence" string="Seq"/>
<field name="date"/>
<field name="val_date"/>
<field name="name"/>
<field name="type"/>
<field name="partner_id"/>
<field domain="[('type', '&lt;&gt;', 'view')]" name="account_id"/>
<field name="amount"/>
<field name="ref"/>
<field name="globalisation_amount"/>
<field name="globalisation_level"/>
<field name="globalisation_id"/>
</group>
<separator string="Notes"/>
<field name="note"/>
</form>
</field>
</page>
</notebook>
<group colspan="4">
<field name="balance_end"/>
</group>
</form>
</field> </field>
</record> </record>
@ -435,21 +445,23 @@
<field name="model">coda.bank.statement.line</field> <field name="model">coda.bank.statement.line</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="CODA Statement Line"> <form string="CODA Statement Line" version="7.0">
<field name="statement_id"/> <group col="4">
<field name="coda_bank_account_id"/> <field name="statement_id"/>
<field name="date"/> <field name="coda_bank_account_id"/>
<field name="val_date"/> <field name="date"/>
<field name="name"/> <field name="val_date"/>
<field name="ref" readonly="0"/> <field name="name"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/> <field name="ref" readonly="0"/>
<field name="type" on_change="onchange_type(partner_id, type)"/> <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/> <field name="type" on_change="onchange_type(partner_id, type)"/>
<field name="amount"/> <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
<field name="globalisation_id"/> <field name="amount"/>
<field name="sequence" readonly="0"/> <field name="globalisation_id"/>
<separator colspan="4" string="Notes"/> <field name="sequence" readonly="0"/>
<field colspan="4" name="note" nolabel="1"/> </group>
<separator string="Notes"/>
<field name="note"/>
</form> </form>
</field> </field>
</record> </record>

37
addons/account_coda/account_coda_wizard.xml
View File

@ -8,17 +8,15 @@
<field name="type">form</field> <field name="type">form</field>
<field name="priority">1</field> <field name="priority">1</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Import CODA File"> <form string="Import CODA File" version="7.0">
<group col="2"> <header>
<separator string="Select Your File :" colspan="4"/> <button name="coda_parsing" string="_Import" type="object" icon="gtk-ok"/>
<field name="coda_data" filename="coda_fname"/> <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
<field name="coda_fname"/> </header>
</group> <group col="2" string="Select Your File :">
<separator colspan="4"/> <field name="coda_data" filename="coda_fname"/>
<group colspan="4"> <field name="coda_fname"/>
<button special="cancel" string="_Cancel" icon="gtk-cancel"/> </group>
<button name="coda_parsing" string="_Import" type="object" icon="gtk-ok"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -29,14 +27,15 @@
<field name="type">form</field> <field name="type">form</field>
<field name="priority">2</field> <field name="priority">2</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Import CODA File"> <form string="Import CODA File" version="7.0">
<separator colspan="4" string="Results :" /> <header>
<field name="note" colspan="4" nolabel="1" width="850" height="400"/> <button name="action_open_coda_statements" string="View CODA Bank Statement(s)" type="object" icon="gtk-apply"/>
<newline/> <button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" icon="gtk-apply"/>
<separator colspan="6"/> <button special="cancel" string="Close" icon="gtk-cancel"/>
<button special="cancel" string="Close" icon="gtk-cancel"/> </header>
<button name="action_open_coda_statements" string="View CODA Bank Statement(s)" type="object" icon="gtk-apply"/> <group string="Results :">
<button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" icon="gtk-apply"/> <field name="note" nolabel="1" colspan="2"/>
</group>
</form> </form>
</field> </field>
</record> </record>

40
addons/account_followup/account_followup_view.xml
View File

@ -19,20 +19,21 @@
<field name="model">account_followup.followup.line</field> <field name="model">account_followup.followup.line</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Follow-Up Steps"> <form string="Follow-Up Steps" version="7.0">
<group col="6" colspan="4"> <group col="4">
<field name="name"/> <field name="name"/>
<field name="delay"/> <field name="delay"/>
<field name="start"/> <field name="start"/>
</group> </group>
<newline/> <separator string="Message"/>
<separator string="Message" colspan="4"/> <field name="description"/>
<field colspan="4" name="description" nolabel="1"/> <separator string="Legend"/>
<separator string="Legend" colspan="4"/> <group>
<label string="%%(partner_name)s: Partner Name" colspan="2"/> <label string="%%(partner_name)s: Partner Name"/>
<label string="%%(date)s: Current Date" colspan="2"/> <label string="%%(date)s: Current Date"/>
<label string="%%(user_signature)s: User Name" colspan="2"/> <label string="%%(user_signature)s: User Name"/>
<label string="%%(company_name)s: User's Company Name" colspan="2"/> <label string="%%(company_name)s: User's Company Name"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -42,11 +43,12 @@
<field name="model">account_followup.followup</field> <field name="model">account_followup.followup</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Follow-Up"> <form string="Follow-Up" version="7.0">
<field name="name"/> <group col="4">
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="name"/>
<newline/> <field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field colspan="4" name="followup_line" nolabel="1"/> </group>
<field name="followup_line"/>
</form> </form>
</field> </field>
</record> </record>

91
addons/account_followup/wizard/account_followup_print_view.xml
View File

@ -7,18 +7,17 @@
<field name="model">account.followup.print</field> <field name="model">account.followup.print</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Send followups"> <form string="Send followups" version="7.0">
<separator string="Send Follow-Ups" colspan="4"/> <header>
<label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information." colspan="4" nolabel="1"/> <button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok"/>
<group col="4" colspan="6"> <button special="cancel" string="Cancel" icon='gtk-cancel'/>
</header>
<separator string="Send Follow-Ups"/>
<label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information."/>
<group col="4">
<field name="followup_id"/> <field name="followup_id"/>
<field name="date"/> <field name="date"/>
</group> </group>
<separator colspan="4"/>
<group col="2" colspan="4">
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -75,38 +74,37 @@
<field name="model">account.followup.print.all</field> <field name="model">account.followup.print.all</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Send followups"> <form string="Send followups" version="7.0">
<group col="4" colspan="6"> <header>
<notebook>
<page string="Partner Selection">
<separator string="Select Partners to Remind" colspan="4"/>
<field name="partner_ids" colspan="4" nolabel="1" context="{'search_default_balance_positive': 1}" domain="[('company_id','=',context.get('company_id',False))]"/>
</page>
<page string="Email Settings">
<field name="email_conf" colspan="4"/>
<field name="partner_lang" colspan="4"/>
<field name="test_print" colspan="4"/>
<field name="email_subject" colspan="4"/>
<separator string="Email Body" colspan="4" />
<field name="email_body" colspan="4" nolabel="1"/>
<separator string="Legend" colspan="4"/>
<label string="%%(partner_name)s: Partner name" colspan="2"/>
<label string="%%(user_signature)s: User name" colspan="2"/>
<label string="%%(followup_amount)s: Total Amount Due" colspan="2"/>
<label string="%%(date)s: Current Date" colspan="2"/>
<label string="%%(company_name)s: User's Company name" colspan="2"/>
<label string="%%(company_currency)s: User's Company Currency" colspan="2"/>
<label string="%%(heading)s: Move line header" colspan="2"/>
<label string="%%(line)s: Ledger Posting lines" colspan="2"/>
</page>
</notebook>
</group>
<separator colspan="4"/>
<group>
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print"/>
<button name="do_mail" string="Send Mails" colspan="1" type="object" icon="gtk-execute"/> <button name="do_mail" string="Send Mails" colspan="1" type="object" icon="gtk-execute"/>
</group> <button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print"/>
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
</header>
<notebook>
<page string="Partner Selection">
<field name="partner_ids" context="{'search_default_balance_positive': 1}" domain="[('company_id','=',context.get('company_id',False))]"/>
</page>
<page string="Email Settings">
<group col="4">
<field name="email_conf" colspan="4"/>
<field name="partner_lang" colspan="4"/>
<field name="test_print" colspan="4"/>
<field name="email_subject" colspan="4"/>
<separator string="Email Body" colspan="4" />
<field name="email_body" colspan="4" nolabel="1"/>
</group>
<group string="Legend">
<label string="%%(partner_name)s: Partner name"/>
<label string="%%(user_signature)s: User name"/>
<label string="%%(followup_amount)s: Total Amount Due"/>
<label string="%%(date)s: Current Date"/>
<label string="%%(company_name)s: User's Company name"/>
<label string="%%(company_currency)s: User's Company Currency"/>
<label string="%%(heading)s: Move line header"/>
<label string="%%(line)s: Ledger Posting lines"/>
</group>
</page>
</notebook>
</form> </form>
</field> </field>
</record> </record>
@ -116,15 +114,12 @@
<field name="model">account.followup.print.all</field> <field name="model">account.followup.print.all</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Summary"> <form string="Summary" version="7.0">
<group col="4" colspan="6"> <header>
<separator string="Summary" colspan="4"/>
<field name="summary" height="300" width="800" nolabel="1"/>
</group>
<separator colspan="4"/>
<group>
<button special="cancel" string="Ok" icon='gtk-cancel'/> <button special="cancel" string="Ok" icon='gtk-cancel'/>
</group> </header>
<separator string="Summary"/>
<field name="summary"/>
</form> </form>
</field> </field>
</record> </record>

15
addons/account_invoice_layout/account_invoice_layout_view.xml
View File

@ -12,7 +12,7 @@
<field name="name" position="before"> <field name="name" position="before">
<field name="state" on_change="onchange_invoice_line_view(state)" /> <field name="state" on_change="onchange_invoice_line_view(state)" />
<field name="sequence"/> <field name="sequence"/>
</field> </field>
</field> </field>
</record> </record>
@ -95,12 +95,13 @@
<field name="model">notify.message</field> <field name="model">notify.message</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Messages"> <form string="Messages" version="7.0">
<separator string="Write a notification or a wishful message." colspan="4"/> <group string="Write a notification or a wishful message.">
<field name="name" colspan="2" /> <field name="name"/>
<newline/> </group>
<separator string="Special Message" colspan="4"/> <group string="Special Message">
<field name="msg" nolabel="1" colspan="2"/> <field name="msg"/>
</group>
</form> </form>
</field> </field>
</record> </record>

13
addons/account_invoice_layout/wizard/account_invoice_special_message.xml
View File

@ -7,14 +7,13 @@
<field name="model">account.invoice.special.msg</field> <field name="model">account.invoice.special.msg</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select Message"> <form string="Select Message" version="7.0">
<group colspan="4" col="6"> <header>
<field name="message"/>
</group>
<separator colspan="4"/>
<group colspan="4" col="6">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" icon="gtk-print"/> <button name="check_report" string="Print" type="object" icon="gtk-print"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
</header>
<group>
<field name="message"/>
</group> </group>
</form> </form>
</field> </field>

144
addons/account_payment/account_payment_view.xml
View File

@ -76,12 +76,14 @@
<field name="model">payment.mode</field> <field name="model">payment.mode</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Payment Mode"> <form string="Payment Mode" version="7.0">
<field name="name" select="1"/> <group col="4">
<field name="journal" select="1"/> <field name="name"/>
<field name="bank_id" domain="[('partner_id','=',partner_id)]" /> <field name="journal"/>
<field name="company_id" select="1" widget='selection' groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/> <field name="bank_id" domain="[('partner_id','=',partner_id)]" />
<field name="partner_id" select="1" widget='selection' invisible="1"/> <field name="company_id" widget='selection' groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
<field name="partner_id" widget='selection' invisible="1"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -100,64 +102,69 @@
<field name="model">payment.order</field> <field name="model">payment.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 version="7.0">
<header> <header>
<button name="open" states="draft" string="Confirm Payments" /> <button name="open" states="draft" string="Confirm Payments" />
<button name="set_done" states="open" string="Make Payments" type="object"/> <button name="set_done" states="open" string="Make Payments" type="object"/>
<button name="set_to_draft" states="cancel" string="Set to draft" type="object"/> <button name="set_to_draft" states="cancel" string="Set to draft" type="object"/>
<button name="cancel" states="draft,open" string="Cancel"/> <button name="cancel" states="draft,open" string="Cancel"/>
<field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/> <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
</header> </header>
<sheet string="Payment order" layout="auto"> <sheet string="Payment order" layout="auto">
<group col="6" colspan="4" class="oe_form_header"> <group col="4">
<field name="reference"/> <field name="reference"/>
<field name="mode" widget='selection'/> <field name="mode" widget='selection'/>
<field name="user_id"/> <field name="user_id"/>
<field name="date_prefered"/> <field name="date_prefered"/>
<field name="date_scheduled" select="1" attrs="{'readonly':[('date_prefered','!=','fixed')]}" /> <field name="date_scheduled" attrs="{'readonly':[('date_prefered','!=','fixed')]}" />
<button colspan="2" name="%(action_create_payment_order)d" string="Select Invoices to Pay" type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
<field name="company_id" widget='selection' groups="base.group_multi_company"/> <field name="company_id" widget='selection' groups="base.group_multi_company"/>
<button name="%(action_create_payment_order)d" string="Select Invoices to Pay"
type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
</group> </group>
<field name="line_ids" colspan="4" widget="one2many_list" nolabel="1" context="{'order_id': active_id or False}" > <field name="line_ids" context="{'order_id': active_id or False}" >
<form string="Payment Line"> <form string="Payment Line" version="7.0">
<notebook> <notebook>
<page string="Payment"> <page string="Payment">
<field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" select="1" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/> <group col="4">
<separator colspan="4" string="Transaction Information"/> <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
<field name="date"/> <separator colspan="4" string="Transaction Information"/>
<group colspan="2"> <field name="date"/>
<field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)"/> <label for="amount_currency"/>
<field name="currency" nolabel="1"/> <div>
<field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_form_inline"/>
<field name="currency" nolabel="1" class="oe_form_inline"/>
</div>
<field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)"/>
<field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
<separator colspan="2" string="Owner Account"/>
<separator colspan="2" string="Destination Account"/>
<field colspan="2" name="info_owner" nolabel="1"/>
<field colspan="2" name="info_partner" nolabel="1"/>
<field colspan="4" name="communication"/>
<field colspan="4" name="communication2"/>
<field name="name"/>
<field name="state"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group> </group>
<field name="partner_id" on_change="onchange_partner(partner_id,parent.mode)" select="1"/>
<field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
<separator colspan="2" string="Owner Account"/>
<separator colspan="2" string="Destination Account"/>
<field colspan="2" name="info_owner" nolabel="1"/>
<field colspan="2" name="info_partner" nolabel="1"/>
<field colspan="4" name="communication"/>
<field colspan="4" name="communication2"/>
<field name="name"/>
<field name="state"/>
<field name="company_id" widget='selection' groups="base.group_multi_company"/>
</page> </page>
<page string="Information"> <page string="Information">
<group col="4" string="General Information">
<separator colspan="4" string="General Information"/> <label for="amount"/>
<group colspan="2"> <div>
<field name="amount"/> <field name="amount" class="oe_form_inline"/>
<field name="company_currency" nolabel="1"/> <field name="company_currency" class="oe_form_inline"/>
</div>
<separator colspan="4" string="Entry Information"/>
<field name="create_date" readonly="1"/>
<field name="ml_maturity_date"/>
<field name="ml_inv_ref"/>
</group> </group>
<separator colspan="4" string="Entry Information"/>
<field name="create_date" readonly="1"/>
<field name="ml_maturity_date"/>
<field name="ml_inv_ref"/>
</page> </page>
</notebook> </notebook>
</form> </form>
<tree string="Payment Line"> <tree string="Payment Line">
<field name="ml_inv_ref" /> <field name="ml_inv_ref" />
<field name="partner_id" select="1"/> <field name="partner_id"/>
<field name="communication"/> <field name="communication"/>
<field name="bank_id" domain="[('partner_id', '=', partner_id)]"/> <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
<field name="ml_maturity_date"/> <field name="ml_maturity_date"/>
@ -242,39 +249,42 @@
<field name="model">payment.line</field> <field name="model">payment.line</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Payment Line"> <form string="Payment Line" version="7.0">
<notebook> <notebook>
<page string="Payment"> <page string="Payment">
<field name="order_id" select="1"/> <group col="4">
<field name="move_line_id" on_change="onchange_move_line(move_line_id, False, currency, company_currency)" select="1" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/> <field name="order_id"/>
<separator colspan="4" string="Transaction Information"/> <field name="move_line_id" on_change="onchange_move_line(move_line_id, False, currency, company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)]"/>
<field name="date"/> <separator colspan="4" string="Transaction Information"/>
<group colspan="2"> <field name="date"/>
<field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)"/> <label for="amount_currency"/>
<field name="currency" nolabel="1"/> <div>
</group> <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_form_inline"/>
<field name="partner_id" on_change="onchange_partner(partner_id, False)" select="1"/> <field name="currency" class="oe_form_inline"/>
<field domain="[('partner_id','=',partner_id)]" name="bank_id"/> </div>
<separator colspan="2" string="Owner Account"/> <field name="partner_id" on_change="onchange_partner(partner_id, False)"/>
<separator colspan="2" string="Desitination Account"/> <field domain="[('partner_id','=',partner_id)]" name="bank_id"/>
<field colspan="2" name="info_owner" nolabel="1"/> <separator colspan="2" string="Owner Account"/>
<field colspan="2" name="info_partner" nolabel="1"/> <separator colspan="2" string="Desitination Account"/>
<field colspan="2" name="info_owner" nolabel="1"/>
<field colspan="2" name="info_partner" nolabel="1"/>
<field colspan="4" name="communication"/> <field colspan="4" name="communication"/>
<field colspan="4" name="communication2"/> <field colspan="4" name="communication2"/>
<field name="name"/> <field name="name"/>
<field name="state"/> <field name="state"/>
</group>
</page> </page>
<page string="Information"> <page string="Information">
<separator colspan="4" string="General Information"/> <group col="4" string="General Information">
<group colspan="2"> <field name="amount"/>
<field name="amount" select="1"/>
<field name="company_currency" nolabel="1"/> <field name="company_currency" nolabel="1"/>
</group> </group>
<separator colspan="4" string="Entry Information"/> <group col="4" string="Entry Information">
<field name="create_date"/> <field name="create_date"/>
<field name="ml_maturity_date"/> <field name="ml_maturity_date"/>
<field name="ml_inv_ref"/> <field name="ml_inv_ref"/>
</group>
</page> </page>
</notebook> </notebook>
</form> </form>
@ -290,7 +300,7 @@
<field name="order_id"/> <field name="order_id"/>
<field name="ml_inv_ref" /> <field name="ml_inv_ref" />
<field name="ml_maturity_date"/> <field name="ml_maturity_date"/>
<field name="partner_id" select="1"/> <field name="partner_id"/>
<field name="communication"/> <field name="communication"/>
<field name="amount" sum="Amount Total"/> <field name="amount" sum="Amount Total"/>
<field name="amount_currency" sum="Currency Amount Total"/> <field name="amount_currency" sum="Currency Amount Total"/>

36
addons/account_payment/wizard/account_payment_create_order_view.xml
View File

@ -2,39 +2,35 @@
<openerp> <openerp>
<data> <data>
<record id="view_create_payment_order" model="ir.ui.view"> <record id="view_create_payment_order" model="ir.ui.view">
<field name="name">payment.order.create.form</field> <field name="name">payment.order.create.form</field>
<field name="model">payment.order.create</field> <field name="model">payment.order.create</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Search Payment lines"> <form string="Search Payment lines" version="7.0">
<group col="4" colspan="6"> <header>
<field name="duedate" />
</group>
<separator colspan="4"/>
<group col="2" colspan="4">
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="search_entries" string="Search" colspan="1" type="object" icon="gtk-execute"/> <button name="search_entries" string="Search" colspan="1" type="object" icon="gtk-execute"/>
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
</header>
<group>
<field name="duedate" />
</group> </group>
</form> </form>
</field> </field>
</record> </record>
<record id="view_create_payment_order_lines" model="ir.ui.view"> <record id="view_create_payment_order_lines" model="ir.ui.view">
<field name="name">payment.order.create.form</field> <field name="name">payment.order.create.form</field>
<field name="model">payment.order.create</field> <field name="model">payment.order.create</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Search Payment lines"> <form string="Search Payment lines" version="7.0">
<group col="4" colspan="6"> <header>
<separator colspan="4" string="Entries"/>
<field name="entries" nolabel="1"/>
</group>
<separator colspan="4"/>
<group col="2" colspan="4">
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="create_payment" string="_Add to payment order" colspan="1" type="object" icon="gtk-execute"/> <button name="create_payment" string="_Add to payment order" colspan="1" type="object" icon="gtk-execute"/>
</group> <button special="cancel" string="Cancel" icon='gtk-cancel'/>
</header>
<separator string="Entries"/>
<field name="entries"/>
</form> </form>
</field> </field>
</record> </record>
@ -49,5 +45,5 @@
<field name="target">new</field> <field name="target">new</field>
</record> </record>
</data> </data>
</openerp> </openerp>

1
addons/account_payment/wizard/account_payment_order.py
View File

@ -46,6 +46,7 @@ class payment_order_create(osv.osv_memory):
} }
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
if not context: context = {}
res = super(payment_order_create, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False) res = super(payment_order_create, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
if context and 'line_ids' in context: if context and 'line_ids' in context:
doc = etree.XML(res['arch']) doc = etree.XML(res['arch'])

39
addons/account_payment/wizard/account_payment_pay_view.xml
View File

@ -7,27 +7,26 @@
<field name="model">account.payment.make.payment</field> <field name="model">account.payment.make.payment</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Make Payment"> <form string="Make Payment" version="7.0">
<separator string="Are you sure you want to make payment?"/> <header>
<newline/> <button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1"/>
<group colspan="2" col="4"> <button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> </header>
<button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1"/> <separator string="Are you sure you want to make payment?"/>
</group> </form>
</form> </field>
</field> </record>
</record>
<record id="action_account_payment_make_payment" model="ir.actions.act_window"> <record id="action_account_payment_make_payment" model="ir.actions.act_window">
<field name="name">Make Payment</field> <field name="name">Make Payment</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">account.payment.make.payment</field> <field name="res_model">account.payment.make.payment</field>
<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="view_id" ref="account_payment_make_payment_view"/> <field name="view_id" ref="account_payment_make_payment_view"/>
<field name="target">new</field> <field name="target">new</field>
</record> </record>
</data> </data>
</openerp> </openerp>

13
addons/account_payment/wizard/account_payment_populate_statement_view.xml
View File

@ -7,13 +7,12 @@
<field name="model">account.payment.populate.statement</field> <field name="model">account.payment.populate.statement</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Populate Statement:"> <form string="Populate Statement:" version="7.0">
<group colspan="4" col="6"> <header>
<field name="lines" colspan="4" height="300" width="800" nolabel="1" />
<separator colspan="6"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="populate_statement" string="ADD" type="object" icon="gtk-ok"/> <button name="populate_statement" string="ADD" type="object" icon="gtk-ok"/>
</group> <button special="cancel" string="Cancel" icon="gtk-cancel"/>
</header>
<field name="lines"/>
</form> </form>
</field> </field>
</record> </record>
@ -41,4 +40,4 @@
</record> </record>
</data> </data>
</openerp> </openerp>

106
addons/account_sequence/account_sequence_installer_view.xml
View File

@ -1,57 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<record id="view_account_sequence_installer" model="ir.ui.view">
<field name="name">account.sequence.installer.view</field>
<field name="model">account.sequence.installer</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.res_config_installer"/>
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Account Sequence Application Configuration</attribute>
</form>
<separator string="title" position="before">
<label string="You can enhance the Account Sequence Application by installing ."/>
</separator>
<xpath expr="//separator[@string='title']" position="after">
<group colspan="8" position="inside">
<field name="name" colspan="4"/>
<field name="prefix"/>
<field name="suffix"/>
<field name="number_next"/>
<field name="number_increment"/>
<field name="padding"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
</xpath>
<separator string="title" position="attributes">
<attribute name="string">Configure Your Account Sequence Application</attribute>
</separator>
<xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">Configure</attribute>
</xpath>
</data>
</field>
</record>
<record id="view_account_sequence_installer" model="ir.ui.view"> <record id="action_account_seq_installer" model="ir.actions.act_window">
<field name="name">account.sequence.installer.view</field> <field name="name">Account Sequence Application Configuration</field>
<field name="model">account.sequence.installer</field> <field name="type">ir.actions.act_window</field>
<field name="type">form</field> <field name="res_model">account.sequence.installer</field>
<field name="inherit_id" ref="base.res_config_installer"/> <field name="view_id" ref="view_account_sequence_installer"/>
<field name="arch" type="xml"> <field name="view_type">form</field>
<data> <field name="view_mode">form</field>
<form position="attributes"> <field name="target">new</field>
<attribute name="string">Account Sequence Application Configuration</attribute> </record>
</form>
<separator string="title" position="attributes"> <record id="account_seq_installer_todo" model="ir.actions.todo">
<attribute name="string">Configure Your Account Sequence Application</attribute> <field name="action_id" ref="action_account_seq_installer"/>
</separator> <field name="category_id" ref="account.category_accounting_configuration"/>
<xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes"> <field name="sequence">3</field>
<attribute name="string"/> <field name="type">automatic</field>
</xpath> </record>
<xpath expr="//label[@string='description']" position="attributes"> </data>
<attribute name="string">You can enhance the Account Sequence Application by installing .</attribute>
</xpath>
<group colspan="8" position="inside">
<field name="name" colspan="4"/>
<field name="prefix"/>
<field name="suffix"/>
<field name="number_next"/>
<field name="number_increment"/>
<field name="padding"/>
<field name="company_id" groups="base.group_multi_company"/>
</group>
<xpath expr="//button[@string='Install Modules']" position="attributes">
<attribute name="string">Configure</attribute>
</xpath>
</data>
</field>
</record>
<record id="action_account_seq_installer" model="ir.actions.act_window">
<field name="name">Account Sequence Application Configuration</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.sequence.installer</field>
<field name="view_id" ref="view_account_sequence_installer"/>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<record id="account_seq_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_account_seq_installer"/>
<field name="category_id" ref="account.category_accounting_configuration"/>
<field name="sequence">3</field>
<field name="type">automatic</field>
</record>
</data>
</openerp> </openerp>

52
addons/account_voucher/account_voucher_view.xml
View File

@ -25,11 +25,13 @@
<field name="model">account.voucher.line</field> <field name="model">account.voucher.line</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Voucher Lines"> <form string="Voucher Lines" version="7.0">
<field name="name"/> <group col="4">
<field name="account_id"/> <field name="name"/>
<field name="partner_id"/> <field name="account_id"/>
<field name="amount"/> <field name="partner_id"/>
<field name="amount"/>
</group>
</form> </form>
</field> </field>
</record> </record>
@ -39,28 +41,28 @@
<field name="model">account.voucher</field> <field name="model">account.voucher</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 version="7.0">
<header> <header>
<button name="proforma_voucher" string="Post" states="draft"/> <button name="proforma_voucher" string="Post" states="draft"/>
<button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record?"/> <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record?"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma" /> <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/> <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/> <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
</header> </header>
<sheet string="Accounting Voucher" layout="auto"> <sheet string="Accounting Voucher">
<group col="6" colspan="4" class="oe_form_header"> <group col="6" colspan="4">
<field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/> <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
<field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/> <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
<field name="journal_id" widget="selection" select="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/> <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
<field name="type" required="1"/> <field name="type" required="1"/>
<field name="name" colspan="2"/> <field name="name" colspan="2"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="reference" select="1"/> <field name="reference"/>
<field name="account_id" widget="selection" invisible="True"/> <field name="account_id" widget="selection" invisible="True"/>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="Voucher Entry"> <page string="Voucher Entry">
<field name="line_ids" on_change="onchange_price(line_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="180"> <field name="line_ids" on_change="onchange_price(line_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
<tree string="Voucher Items" editable="bottom"> <tree string="Voucher Items" editable="bottom">
<field name="account_id"/> <field name="account_id"/>
<field name="name"/> <field name="name"/>
@ -69,29 +71,29 @@
<field name="account_analytic_id" groups="analytic.group_analytic_accounting"/> <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
</tree> </tree>
</field> </field>
<group col="2" colspan="3"> <group col="3">
<separator string="Internal Notes" colspan="2"/> <group string="Internal Notes">
<field name="narration" colspan="2" nolabel="1"/> <field name="narration" colspan="2" nolabel="1"/>
</group> </group>
<group col="2" colspan="1"> <group string="Other Information">
<group col="2" colspan="1" >
<separator string="Other Information" colspan="2"/>
<field name="number"/> <field name="number"/>
<field name="currency_id"/> <field name="currency_id"/>
</group> </group>
<group col="4" colspan="1" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}"> <group col="4" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}">
<separator string="Total" colspan="4"/> <separator string="Total" colspan="4"/>
<field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/> <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
<field name="tax_amount" nolabel="1"/>
<button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
<label colspan="1" string=""/><field name="amount" string="Total"/> <label colspan="1" string=""/><field name="amount" string="Total"/>
</group> </group>
</group> </group>
</page> </page>
<page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}"> <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
<group col="6" colspan="4"> <group col="4">
<field name="period_id"/> <field name="period_id"/>
<field name="audit"/> <field name="audit"/>
</group> </group>
<field name="move_ids" colspan="4" nolabel="1" readonly="1"> <field name="move_ids" readonly="1">
<tree string="Journal Items"> <tree string="Journal Items">
<field name="move_id"/> <field name="move_id"/>
<field name="ref"/> <field name="ref"/>
@ -231,7 +233,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="account.view_bank_statement_form"/> <field name="inherit_id" ref="account.view_bank_statement_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/field[@name='sequence']" position="before"> <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/group/field[@name='sequence']" position="before">
<field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/> <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
</xpath> </xpath>
</field> </field>
@ -254,7 +256,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="account.view_bank_statement_form2"/> <field name="inherit_id" ref="account.view_bank_statement_form2"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//page/field[@name='line_ids']/form/field[@name='amount']" position="after"> <xpath expr="//page/field[@name='line_ids']/form/group/field[@name='amount']" position="after">
<field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/> <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
</xpath> </xpath>
</field> </field>

146
addons/account_voucher/voucher_payment_receipt_view.xml
View File

@ -72,17 +72,17 @@
<field name="type">form</field> <field name="type">form</field>
<field name="priority">1</field> <field name="priority">1</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Bill Payment"> <form string="Bill Payment" version="7.0">
<group col="6" colspan="4"> <group col="6">
<field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Supplier" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1, 'invoice_currency': currency_id}" /> <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Supplier" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1, 'invoice_currency': currency_id}" />
<field name="amount" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/> <field name="amount" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
<field name="journal_id" <field name="journal_id"
domain="[('type','in',['bank', 'cash'])]" domain="[('type','in',['bank', 'cash'])]"
widget="selection" select="1" widget="selection"
on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)" on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
string="Payment Method"/> string="Payment Method"/>
<field name="date" select="1" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/> <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
<field name="reference" select="1" string="Payment Ref"/> <field name="reference" string="Payment Ref"/>
<field name="name" colspan="2"/> <field name="name" colspan="2"/>
<field name="account_id" <field name="account_id"
widget="selection" widget="selection"
@ -90,7 +90,7 @@
<field name="pre_line" invisible="1"/> <field name="pre_line" invisible="1"/>
<field name="type" invisible="True"/> <field name="type" invisible="True"/>
</group> </group>
<notebook colspan="4"> <notebook>
<page string="Payment Information"> <page string="Payment Information">
<field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)"> <field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
<tree string="Open Supplier Journal Entries" editable="bottom" colors="gray:amount==0"> <tree string="Open Supplier Journal Entries" editable="bottom" colors="gray:amount==0">
@ -106,7 +106,7 @@
<field name="amount" sum="Total Allocation"/> <field name="amount" sum="Total Allocation"/>
</tree> </tree>
</field> </field>
<field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('type', '=', 'payment')]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)"> <field name="line_cr_ids" attrs="{'invisible': [('type', '=', 'payment')]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
<tree string="Open Customer Journal Entries" editable="bottom" colors="gray:amount==0"> <tree string="Open Customer Journal Entries" editable="bottom" colors="gray:amount==0">
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}" <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
on_change="onchange_move_line_id(move_line_id)" on_change="onchange_move_line_id(move_line_id)"
@ -120,17 +120,17 @@
<field name="amount" sum="Total Allocation"/> <field name="amount" sum="Total Allocation"/>
</tree> </tree>
</field> </field>
<group col="2" colspan="3"> <group>
<separator string="Internal Notes" colspan="2"/> <group string="Internal Notes">
<field name="narration" colspan="2" nolabel="1"/> <field name="narration" nolabel="1" colspan="2"/>
</group> </group>
<group col="4" colspan="1"> <group string="Other Information" col="4">
<separator string="Other Information" colspan="4"/> <field name="currency_id" colspan="4"/>
<field name="currency_id" colspan="4"/> <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
<field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/> <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
<field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/> <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
<field name="paid_amount_in_company_currency" colspan="4" invisible="1"/> <field name="number" colspan="4"/>
<field name="number" colspan="4"/> </group>
</group> </group>
</page> </page>
</notebook> </notebook>
@ -143,26 +143,26 @@
<field name="model">account.voucher</field> <field name="model">account.voucher</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 version="7.0">
<header> <header>
<button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/> <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma" invisible="context.get('line_type', False)"/> <button name="cancel_voucher" string="Cancel" states="draft,proforma" invisible="context.get('line_type', False)"/>
<button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/> <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/> <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/> <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
</header> </header>
<sheet string="Bill Payment" layout="auto"> <sheet string="Bill Payment">
<group col="6" colspan="4" class="oe_form_header"> <group col="6">
<field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" string="Supplier"/> <field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" string="Supplier"/>
<field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/> <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
<field name="journal_id" <field name="journal_id"
domain="[('type','in',['bank', 'cash'])]" domain="[('type','in',['bank', 'cash'])]"
invisible="context.get('line_type', False)" invisible="context.get('line_type', False)"
widget="selection" select="1" widget="selection"
on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)" on_change="onchange_journal(journal_id, line_dr_ids, False, partner_id, date, amount, type, company_id, context)"
string="Payment Method"/> string="Payment Method"/>
<field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/> <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
<field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/> <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
<field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/> <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="account_id" <field name="account_id"
@ -172,9 +172,9 @@
<field name="type" invisible="True"/> <field name="type" invisible="True"/>
<field name="currency_id" invisible="1" colspan="4"/> <field name="currency_id" invisible="1" colspan="4"/>
</group> </group>
<notebook colspan="4"> <notebook>
<page string="Payment Information"> <page string="Payment Information">
<field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140"> <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
<tree string="Supplier Invoices and Outstanding transactions" editable="bottom" colors="gray:amount==0"> <tree string="Supplier Invoices and Outstanding transactions" editable="bottom" colors="gray:amount==0">
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}" <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
on_change="onchange_move_line_id(move_line_id)" on_change="onchange_move_line_id(move_line_id)"
@ -190,7 +190,7 @@
<field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/> <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
</tree> </tree>
</field> </field>
<field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}"> <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}">
<tree string="Credits" editable="bottom" colors="gray:amount==0"> <tree string="Credits" editable="bottom" colors="gray:amount==0">
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}" <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
on_change="onchange_move_line_id(move_line_id)" on_change="onchange_move_line_id(move_line_id)"
@ -206,39 +206,40 @@
<field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/> <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
</tree> </tree>
</field> </field>
<group col="2" colspan="3"> <group>
<separator string="Internal Notes" colspan="2"/> <group string="Internal Notes">
<field name="narration" colspan="2" nolabel="1"/> <field name="narration" colspan="2" nolabel="1"/>
</group>
<group col="2" colspan="1">
<group col="4" colspan="1" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
<separator string="Currency Options" colspan="4"/>
<field name="is_multi_currency" invisible="1"/>
<field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
<field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
<field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
</group> </group>
<group col="2" colspan="1"> <group>
<separator string="Payment Options" colspan="2"/> <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
<field name="writeoff_amount"/> <separator string="Currency Options" colspan="4"/>
<field name="payment_option" required="1"/> <field name="is_multi_currency" invisible="1"/>
<field name="writeoff_acc_id" <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}" <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
domain="[('type','=','other')]"/> <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
<field name="comment" </group>
attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/> <group col="2">
<field name="analytic_id" <separator string="Payment Options" colspan="2"/>
groups="analytic.group_analytic_accounting"/> <field name="writeoff_amount"/>
<field name="payment_option" required="1"/>
<field name="writeoff_acc_id"
attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
domain="[('type','=','other')]"/>
<field name="comment"
attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
<field name="analytic_id"
groups="analytic.group_analytic_accounting"/>
</group>
</group> </group>
</group> </group>
</page> </page>
<page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}"> <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
<group col="6" colspan="4"> <group col="4">
<field name="period_id"/> <field name="period_id"/>
<field name="audit"/> <field name="audit"/>
<field name="number"/>
</group> </group>
<field name="number" colspan="4"/> <field name="move_ids" readonly="1">
<field name="move_ids" colspan="4" nolabel="1" readonly="1">
<tree string="Journal Items"> <tree string="Journal Items">
<field name="move_id"/> <field name="move_id"/>
<field name="ref"/> <field name="ref"/>
@ -294,16 +295,16 @@
<field name="model">account.voucher</field> <field name="model">account.voucher</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 version="7.0">
<header> <header>
<button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/> <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma" invisible="context.get('line_type', False)"/> <button name="cancel_voucher" string="Cancel" states="draft,proforma" invisible="context.get('line_type', False)"/>
<button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/> <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/> <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/> <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
</header> </header>
<sheet string="Customer Payment" layout="auto"> <sheet>
<group col="6" colspan="4" class="oe_form_header"> <group col="6">
<field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/> <field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
<field name="currency_id" invisible="1"/> <field name="currency_id" invisible="1"/>
<field name="amount" <field name="amount"
@ -313,11 +314,11 @@
<field name="journal_id" <field name="journal_id"
domain="[('type','in',['bank', 'cash'])]" domain="[('type','in',['bank', 'cash'])]"
invisible="context.get('line_type', False)" invisible="context.get('line_type', False)"
widget="selection" select="1" widget="selection"
on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)" on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
string="Payment Method"/> string="Payment Method"/>
<field name="date" select="1" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/> <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
<field name="reference" select="1" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/> <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="003/10"/>
<field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/> <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="Invoice SAJ/0042"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="account_id" <field name="account_id"
@ -326,9 +327,9 @@
<field name="pre_line" invisible="1"/> <field name="pre_line" invisible="1"/>
<field name="type" invisible="True"/> <field name="type" invisible="True"/>
</group> </group>
<notebook colspan="4"> <notebook>
<page string="Payment Information"> <page string="Payment Information">
<field name="line_cr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)"> <field name="line_cr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
<tree string="Invoices and outstanding transactions" editable="bottom" colors="gray:amount==0"> <tree string="Invoices and outstanding transactions" editable="bottom" colors="gray:amount==0">
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}" <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
on_change="onchange_move_line_id(move_line_id)" on_change="onchange_move_line_id(move_line_id)"
@ -344,7 +345,7 @@
<field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)" string="Allocation"/> <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)" string="Allocation"/>
</tree> </tree>
</field> </field>
<field name="line_dr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)"> <field name="line_dr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, context)">
<tree string="Credits" editable="bottom" colors="gray:amount==0"> <tree string="Credits" editable="bottom" colors="gray:amount==0">
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}" <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
on_change="onchange_move_line_id(move_line_id)" on_change="onchange_move_line_id(move_line_id)"
@ -360,19 +361,18 @@
<field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)" string="Allocation"/> <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)" string="Allocation"/>
</tree> </tree>
</field> </field>
<group col="2" colspan="3"> <group col="3">
<separator string="Internal Notes" colspan="2"/> <group col="2" string="Internal Notes">
<field name="narration" colspan="2" nolabel="1"/> <field name="narration" colspan="2" nolabel="1"/>
</group> </group>
<group col="2" colspan="1"> <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
<group col="4" colspan="1" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
<separator string="Currency Options" colspan="4"/> <separator string="Currency Options" colspan="4"/>
<field name="is_multi_currency" invisible="1"/> <field name="is_multi_currency" invisible="1"/>
<field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/> <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
<field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/> <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
<field name="paid_amount_in_company_currency" colspan="4" invisible="1"/> <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
</group> </group>
<group col="2" colspan="1"> <group col="2">
<separator string="Payment Options" colspan="2"/> <separator string="Payment Options" colspan="2"/>
<field name="writeoff_amount"/> <field name="writeoff_amount"/>
<field name="payment_option" required="1"/> <field name="payment_option" required="1"/>
@ -387,12 +387,12 @@
</group> </group>
</page> </page>
<page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}"> <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
<group col="6" colspan="4"> <group col="4">
<field name="period_id"/> <field name="period_id"/>
<field name="audit"/> <field name="audit"/>
<field name="number"/>
</group> </group>
<field name="number" colspan="4"/> <field name="move_ids" readonly="1">
<field name="move_ids" colspan="4" nolabel="1" readonly="1">
<tree string="Journal Items"> <tree string="Journal Items">
<field name="move_id"/> <field name="move_id"/>
<field name="ref"/> <field name="ref"/>

64
addons/account_voucher/voucher_sales_purchase_view.xml
View File

@ -80,29 +80,29 @@
<field name="model">account.voucher</field> <field name="model">account.voucher</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 version="7.0">
<header> <header>
<button name="proforma_voucher" string="Validate" states="draft"/> <button name="proforma_voucher" string="Validate" states="draft"/>
<button 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'),'|',('state','=','draft'), ('paid','=',True)]}"/> <button 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'),'|',('state','=','draft'), ('paid','=',True)]}"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma" /> <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
<button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/> <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/> <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/> <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
</header> </header>
<sheet string="Sales Receipt" layout="auto"> <sheet string="Sales Receipt" layout="auto">
<group col="6" colspan="4" class="oe_form_header"> <group col="6">
<field name="partner_id" domain="[('customer','=',True)]" 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="partner_id" domain="[('customer','=',True)]" 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="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="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="number"/>
<field name="name" colspan="2"/> <field name="name" colspan="2"/>
<field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="type" invisible="True"/> <field name="type" invisible="True"/>
<field name="currency_id"/> <field name="currency_id"/>
</group> </group>
<notebook colspan="4"> <notebook>
<page string="Sales Information"> <page string="Sales Information">
<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"> <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}">
<tree string="Sales Lines" editable="bottom"> <tree string="Sales Lines" editable="bottom">
<field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection"/> <field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection"/>
<field name="name"/> <field name="name"/>
@ -110,12 +110,11 @@
<field name="account_analytic_id" groups="analytic.group_analytic_accounting"/> <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
</tree> </tree>
</field> </field>
<group col="2" colspan="3"> <group col="3">
<separator string="Internal Notes" colspan="2"/> <group string="Internal Notes" col="1">
<field name="narration" colspan="2" nolabel="1"/> <field name="narration"/>
</group> </group>
<group col="2" colspan="1"> <group col="2">
<group col="2" colspan="1">
<separator string="Payment Options" colspan="2"/> <separator string="Payment Options" colspan="2"/>
<field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/> <field name="pay_now" on_change="onchange_payment(pay_now, journal_id, partner_id)" required="1"/>
<field name="account_id" <field name="account_id"
@ -128,7 +127,7 @@
<field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/> <field name="date_due" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
<field name="paid" invisible="1"/> <field name="paid" invisible="1"/>
</group> </group>
<group col="4" colspan="1"> <group col="4">
<separator string="Total" colspan="4"/> <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')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" 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" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
<label string="" colspan="1"/><field name="amount" string="Total"/> <label string="" colspan="1"/><field name="amount" string="Total"/>
@ -136,11 +135,11 @@
</group> </group>
</page> </page>
<page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}"> <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
<group col="6" colspan="4"> <group col="4">
<field name="period_id"/> <field name="period_id"/>
<field name="audit"/> <field name="audit"/>
</group> </group>
<field name="move_ids" colspan="4" nolabel="1" readonly="1"> <field name="move_ids" readonly="1">
<tree string="Journal Items"> <tree string="Journal Items">
<field name="move_id"/> <field name="move_id"/>
<field name="ref"/> <field name="ref"/>
@ -206,32 +205,32 @@
<field name="model">account.voucher</field> <field name="model">account.voucher</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 version="7.0">
<header> <header>
<button name="proforma_voucher" string="Validate" states="draft"/> <button name="proforma_voucher" string="Validate" states="draft"/>
<button 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','=','draft'), ('paid','=',True)]}"/> <button 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','=','draft'), ('paid','=',True)]}"/>
<button name="cancel_voucher" string="Cancel" states="draft,proforma" /> <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
<button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/> <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
<button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/> <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/> <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
</header> </header>
<sheet string="Supplier Voucher" layout="auto"> <sheet string="Supplier Voucher">
<field name="pay_now" invisible="1"/> <field name="pay_now" invisible="1"/>
<group col="6" colspan="4" class="oe_form_header"> <group col="6">
<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="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="date" string="Bill Date" 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="journal_id" domain="[('type','in',['purchase','purchase_refund'])]" widget="selection" on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"/>
<field name="number"/> <field name="number"/>
<field name="name" colspan="2"/> <field name="name" colspan="2"/>
<field name="reference" select="1"/> <field name="reference"/>
<field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/>
<field name="account_id" domain="[('type','=','other')]" invisible="True"/> <field name="account_id" domain="[('type','=','other')]" invisible="True"/>
<field name="type" invisible="True"/> <field name="type" invisible="True"/>
<field name="currency_id"/> <field name="currency_id"/>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="Bill Information"> <page string="Bill Information">
<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"> <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}">
<tree string="Expense Lines" editable="bottom"> <tree string="Expense Lines" editable="bottom">
<field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"/> <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"/>
<field name="name"/> <field name="name"/>
@ -239,17 +238,16 @@
<field name="account_analytic_id" groups="analytic.group_analytic_accounting"/> <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
</tree> </tree>
</field> </field>
<group col="2" colspan="3"> <group col="3">
<separator string="Internal Notes" colspan="2"/> <group col="1" string="Internal Notes">
<field name="narration" colspan="2" nolabel="1"/> <field name="narration"/>
</group> </group>
<group col="2" colspan="1"> <group col="2">
<group col="2" colspan="1">
<separator string="Payment Terms" colspan="2"/> <separator string="Payment Terms" colspan="2"/>
<field name="date_due"/> <field name="date_due"/>
<field name="paid" invisible="1"/> <field name="paid" invisible="1"/>
</group> </group>
<group col="4" colspan="1"> <group col="4">
<separator string="Total" colspan="4"/> <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')), ('parent_id', '=', False)]"/><field name="tax_amount" nolabel="1"/><button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" 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" attrs="{'invisible': [('state','!=','draft')]}"/>
<label string="" colspan="1"/><field name="amount" string="Total"/> <label string="" colspan="1"/><field name="amount" string="Total"/>
@ -257,11 +255,11 @@
</group> </group>
</page> </page>
<page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}"> <page string="Journal Items" attrs="{'invisible': [('state','!=','posted')]}">
<group col="6" colspan="4"> <group col="4">
<field name="period_id"/> <field name="period_id"/>
<field name="audit"/> <field name="audit"/>
</group> </group>
<field name="move_ids" colspan="4" nolabel="1" readonly="1"> <field name="move_ids" readonly="1">
<tree string="Journal Items"> <tree string="Journal Items">
<field name="move_id"/> <field name="move_id"/>
<field name="ref"/> <field name="ref"/>

23
addons/account_voucher/wizard/account_voucher_unreconcile_view.xml
View File

@ -7,12 +7,13 @@
<field name="model">account.voucher.unreconcile</field> <field name="model">account.voucher.unreconcile</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Unreconciliation"> <form string="Unreconciliation" version="7.0">
<separator colspan="4" string="Unreconciliation Transactions" /> <header>
<label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/> <button special="cancel" string="Cancel" icon="gtk-cancel"/>
<separator colspan="4"/> <button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" icon="gtk-ok"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> </header>
<button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" icon="gtk-ok"/> <separator string="Unreconciliation Transactions" />
<label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"/>
</form> </form>
</field> </field>
</record> </record>
@ -24,14 +25,6 @@
<field name="view_id" ref="view_account_voucher_unreconcile"/> <field name="view_id" ref="view_account_voucher_unreconcile"/>
<field name="target">new</field> <field name="target">new</field>
</record> </record>
<!-- <act_window name="Unreconcile entries" -->
<!-- res_model="account.voucher.unreconcile"-->
<!-- src_model="account.voucher"-->
<!-- view_mode="form"-->
<!-- target="new" -->
<!-- key2="client_action_multi" -->
<!-- id="action_view_account_voucher_unreconcile"/>-->
</data> </data>
</openerp> </openerp>

4
addons/analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml
View File

@ -60,7 +60,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='Information']/group/field[@name='account_id']" position="replace"> <xpath expr="//page[@string='Information']//field[@name='account_id']" position="replace">
<field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount, journal_id)" select="1"/> <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount, journal_id)" select="1"/>
</xpath> </xpath>
</field> </field>
@ -72,7 +72,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='Information']/group/field[@name='journal_id']" position="replace"> <xpath expr="//page[@string='Information']//field[@name='journal_id']" position="replace">
<field name="journal_id" select="1" required="1" on_change="on_change_journal_id(journal_id, account_id)"/> <field name="journal_id" select="1" required="1" on_change="on_change_journal_id(journal_id, account_id)"/>
</xpath> </xpath>
</field> </field>

4
addons/analytic_user_function/analytic_user_function_view.xml
View File

@ -77,7 +77,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="/form/notebook/page[@string='Information']/group/field[@name='account_id']" position="replace"> <xpath expr="//field[@name='account_id']" position="replace">
<field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" select="1"/> <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" select="1"/>
</xpath> </xpath>
</field> </field>
@ -89,7 +89,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/> <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="/form/group/field[@name='user_id']" position="replace"> <xpath expr="//field[@name='user_id']" position="replace">
<field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/> <field name="user_id" select="1" required="1" on_change="on_change_user_id(user_id, account_id, unit_amount)"/>
</xpath> </xpath>
</field> </field>

4
addons/anonymization/anonymization.py
View File

@ -289,6 +289,10 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, *args, **kwargs): def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, *args, **kwargs):
state = self.pool.get('ir.model.fields.anonymization')._get_global_state(cr, uid, context=context) state = self.pool.get('ir.model.fields.anonymization')._get_global_state(cr, uid, context=context)
if context is None:
context = {}
step = context.get('step', 'new_window') step = context.get('step', 'new_window')
res = super(ir_model_fields_anonymize_wizard, self).fields_view_get(cr, uid, view_id, view_type, context, *args, **kwargs) res = super(ir_model_fields_anonymize_wizard, self).fields_view_get(cr, uid, view_id, view_type, context, *args, **kwargs)

68
addons/anonymization/anonymization_view.xml
View File

@ -9,17 +9,17 @@
<field name="model">ir.model.fields.anonymization</field> <field name="model">ir.model.fields.anonymization</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Anonymized Field"> <form string="Anonymized Field" version="7.0">
<group colspan="4" col="8"> <group col="4">
<field name="model_id" select="1" on_change="onchange_model_id(model_id)" /> <field name="model_id" on_change="onchange_model_id(model_id)" />
<field name="model_name" select="1" on_change="onchange_model_name(model_name)" /> <field name="model_name" on_change="onchange_model_name(model_name)" />
<field name="field_id" <field name="field_id"
select="1"
on_change="onchange_field_id(field_id, model_name)" on_change="onchange_field_id(field_id, model_name)"
domain="[('model_id','=',model_id), ('ttype', 'not in', ['function', 'binary', 'many2many', 'many2one', 'one2many', 'reference'])]" /> domain="[('model_id','=',model_id), ('ttype', 'not in', ['function', 'binary', 'many2many', 'many2one', 'one2many', 'reference'])]" />
<field name="field_name" select="1" on_change="onchange_field_name(field_name, model_name)" /> <field name="field_name" on_change="onchange_field_name(field_name, model_name)" />
<field name="state" />
</group> </group>
<field name="state" />
</form> </form>
</field> </field>
</record> </record>
@ -55,28 +55,24 @@
<field name="model">ir.model.fields.anonymize.wizard</field> <field name="model">ir.model.fields.anonymize.wizard</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Database Anonymization"> <form string="Database Anonymization" version="7.0">
<label string="Summary" /> <header>
<newline /> <button name="anonymize_database"
<group colspan="4" col="4"> string="Anonymize Database"
<field name="summary" nolabel="1" readonly="0" width="400" /> type="object"
</group> states="clear" />
<newline /> <button name="reverse_anonymize_database"
<group name="placeholder1"> string="Reverse the Database Anonymization"
type="object"
states="anonymized" />
<field name="state" widget="statusbar"/>
</header>
<field name="summary" readonly="0"/>
<group name="placeholder1" col="4">
<field name="file_export" /> <field name="file_export" />
<field name="file_import" /> <field name="file_import" />
<field name="msg" /> <field name="msg" />
</group> </group>
<button name="anonymize_database"
string="Anonymize Database"
type="object"
states="clear" />
<button name="reverse_anonymize_database"
string="Reverse the Database Anonymization"
type="object"
states="anonymized" />
<newline />
<field name="state" />
</form> </form>
</field> </field>
</record> </record>
@ -105,20 +101,18 @@
<field name="model">ir.model.fields.anonymization.history</field> <field name="model">ir.model.fields.anonymization.history</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Anonymization History"> <form string="Anonymization History" version="7.0">
<group colspan="4" col="16"> <group col="4">
<field name="date" select="1" colspan="1" /> <field name="date"/>
<field name="state" select="1" colspan="1" /> <field name="state"/>
<field name="filepath" colspan="7" /> <field name="filepath"/>
<field name="direction" colspan="3" /> <field name="direction"/>
</group> </group>
<group colspan="4" col="2"> <group string="Message" col="1">
<label string="Message" /> <field name="msg" nolabel="1" readonly="0"/>
<field name="msg" nolabel="1" colspan="4" readonly="0" height="150" />
</group> </group>
<group colspan="4" col="2"> <group string="Fields" col="1">
<label string="Fields" /> <field name="field_ids" nolabel="1">
<field name="field_ids" nolabel="1" colspan="4" height="300">
<tree> <tree>
<field name="model_id" /> <field name="model_id" />
<field name="field_id" /> <field name="field_id" />

2365
addons/auction/i18n/ja.po
View File

File diff suppressed because it is too large Load Diff

2946
addons/auction/i18n/pt.po
View File

File diff suppressed because it is too large Load Diff

54
addons/audittrail/audittrail_view.xml
View File

@ -11,24 +11,26 @@
<field name="model">audittrail.rule</field> <field name="model">audittrail.rule</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="AuditTrail Rule"> <form string="AuditTrail Rule" version="7.0">
<field name="name" select="1" required="1"/> <header>
<field name="object_id" select="1"/>
<field name="log_read"/>
<field name="log_write"/>
<field name="log_unlink"/>
<field name="log_create"/>
<field name="log_action"/>
<field name="log_workflow"/>
<separator string="Users (if User is not added then it will applicable for all users)" colspan="4" />
<field name="user_id" select="1" colspan="4" nolabel="1" />
<field name="action_id" colspan="4" readonly="1" groups="base.group_no_one"/>
<field name="state" select="1" readonly="1" />
<group colspan="2" col="2">
<button string="_Subscribe" name="subscribe" icon="gtk-ok" <button string="_Subscribe" name="subscribe" icon="gtk-ok"
type="object" states="draft" /> type="object" states="draft" />
<button string="UnSubscribe" name="unsubscribe" icon="gtk-cancel" <button string="UnSubscribe" name="unsubscribe" icon="gtk-cancel"
type="object" states="subscribed" /> type="object" states="subscribed" />
<field name="state" widget="statusbar"/>
</header>
<group col="4">
<field name="name" required="1"/>
<field name="object_id"/>
<field name="log_read"/>
<field name="log_write"/>
<field name="log_unlink"/>
<field name="log_create"/>
<field name="log_action"/>
<field name="log_workflow"/>
<separator string="Users (if User is not added then it will applicable for all users)" colspan="4" />
<field name="user_id" colspan="4" nolabel="1" />
<field name="action_id" colspan="4" readonly="1" groups="base.group_no_one"/>
</group> </group>
</form> </form>
</field> </field>
@ -93,16 +95,19 @@
<field name="model">audittrail.log</field> <field name="model">audittrail.log</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="AuditTrail Logs"> <form string="AuditTrail Logs" version="7.0">
<field name="timestamp" select="1" required="1" readonly="1"/> <group col="4">
<field name="user_id" select="1" readonly="1"/> <field name="timestamp" required="1" readonly="1"/>
<field name="method" select="1" readonly="1"/> <field name="user_id" readonly="1"/>
<field name="name" readonly="1" select="1"/> <field name="method" readonly="1"/>
<field name="res_id" readonly="1"/> <field name="name" readonly="1"/>
<field name="object_id" select="1" readonly="1"/> <field name="res_id" readonly="1"/>
<field name="line_ids" colspan="4" mode="tree,form" <field name="object_id" readonly="1"/>
widget="one2many_list" readonly="1" nolabel="1"> </group>
<form string="Log Lines"> <field name="line_ids" mode="tree,form"
widget="one2many_list" readonly="1">
<form string="Log Lines" version="7.0">
<group col="4">
<field name="field_id" colspan="4" <field name="field_id" colspan="4"
readonly="1" /> readonly="1" />
<newline /> <newline />
@ -128,6 +133,7 @@
colspan="2" readonly="1" /> colspan="2" readonly="1" />
<field name="new_value_text" nolabel="1" <field name="new_value_text" nolabel="1"
colspan="2" readonly="1" /> colspan="2" readonly="1" />
</group>
</form> </form>
<tree string="Log Lines"> <tree string="Log Lines">
<field name="field_description" /> <field name="field_description" />

36
addons/audittrail/wizard/audittrail_view_log_view.xml
View File

@ -1,41 +1,37 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<!-- Audittrail View Log wizard--> <!-- Audittrail View Log wizard-->
<record id="view_audittrail_view_log" model="ir.ui.view"> <record id="view_audittrail_view_log" model="ir.ui.view">
<field name="name">audittrail.view.log.form</field> <field name="name">audittrail.view.log.form</field>
<field name="model">audittrail.view.log</field> <field name="model">audittrail.view.log</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Audit Logs"> <form string="Audit Logs" version="7.0">
<group colspan="4" > <header>
<field name="from" colspan="4"/> <button icon="gtk-cancel" special="cancel" string="Cancel" />
<newline/> <button icon="gtk-open" string="Open Logs" name="log_open_window" type="object" />
<field name="to" colspan="4"/> </header>
</group> <group col="4">
<separator string="" colspan="4" /> <field name="from"/>
<group colspan="4" col="6"> <field name="to"/>
<button icon="gtk-cancel" special="cancel"
string="Cancel" />
<button icon="gtk-open" string="Open Logs"
name="log_open_window" type="object" />
</group> </group>
</form> </form>
</field> </field>
</record> </record>
<!-- action for audittrail view log wizard --> <!-- action for audittrail view log wizard -->
<record id="action_audittrail_view_log" model="ir.actions.act_window"> <record id="action_audittrail_view_log" model="ir.actions.act_window">
<field name="name">View log</field> <field name="name">View log</field>
<field name="res_model">audittrail.view.log</field> <field name="res_model">audittrail.view.log</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="view_id" ref="view_audittrail_view_log"/> <field name="view_id" ref="view_audittrail_view_log"/>
<field name="target">new</field> <field name="target">new</field>
</record> </record>
</data> </data>
</openerp> </openerp>

93
addons/base_action_rule/base_action_rule_view.xml
View File

@ -12,51 +12,51 @@
<field name="model">base.action.rule</field> <field name="model">base.action.rule</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Action Rule"> <form string="Action Rule" version="7.0">
<group col="6" colspan="4"> <group col="4">
<field name="name"/> <field name="name"/>
<field name="model_id" select="1" on_change="onchange_model_id(model_id)"/> <field name="model_id" on_change="onchange_model_id(model_id)"/>
<field name="filter_id" /> <field name="filter_id" />
<field name="sequence"/> <field name="sequence"/>
<field name="active"/> <field name="active"/>
</group> </group>
<notebook colspan="4"> <notebook>
<page string="Conditions"> <page string="Conditions">
<group col="2" colspan="2" name="model"> <group>
<separator colspan="4" string="Conditions on Model Fields"/> <group name="model" string="Conditions on Model Fields">
<field name="regex_name" colspan="2"/> <field name="regex_name"/>
<field name="trg_user_id"/> <field name="trg_user_id"/>
</group> </group>
<group col="2" colspan="2" name="partner"> <group name="partner" string="Conditions on Model Partner">
<separator colspan="4" string="Conditions on Model Partner"/> <field name="trg_partner_id"/>
<field name="trg_partner_id"/> <field name="trg_partner_categ_id"/>
<field name="trg_partner_categ_id"/> </group>
</group> <group string="Conditions on States">
<group col="2" colspan="2"> <field name="trg_state_from"/>
<separator colspan="4" string="Conditions on States"/> <field name="trg_state_to"/>
<field name="trg_state_from"/> </group>
<field name="trg_state_to"/> <group string="Conditions on Timing">
</group> <field name="trg_date_type"/>
<group col="2" colspan="2"> <group attrs="{'invisible': [('trg_date_type', '=', 'none')]}">
<separator colspan="4" string="Conditions on Timing"/> <field name="trg_date_range" string="Delay After Trigger Date"/>
<field name="trg_date_type"/> <field name="trg_date_range_type"/>
<group col="3" colspan="2" attrs="{'invisible': [('trg_date_type', '=', 'none')]}"> </group>
<field name="trg_date_range" string="Delay After Trigger Date"/>
<field name="trg_date_range_type" nolabel="1"/>
</group> </group>
</group> </group>
<separator colspan="4" string="Note"/> <separator string="Note"/>
<label align="0.0" colspan="4" width="900" <label string="The rule uses the AND operator. The model must match all non-empty fields so that the rule executes the action described in the 'Actions' tab." />
string="The rule uses the AND operator. The model must match all non-empty fields so that the rule executes the action described in the 'Actions' tab." />
</page> </page>
<page string="Actions"> <page string="Actions">
<separator colspan="4" string="Fields to Change"/> <group string="Fields to Change" col="4">
<field name="act_user_id"/> <field name="act_user_id"/>
<field name="act_state"/> <field name="act_state"/>
<separator colspan="4" string="Server Action to be Triggered"/> </group>
<field name="server_action_id"/> <group col="2" string="Server Action to be Triggered">
<field name="server_action_id"/>
</group>
</page> </page>
<page string="Email Actions"> <page string="Email Actions">
<group col="4">
<separator colspan="4" string="Email Reminders"/> <separator colspan="4" string="Email Reminders"/>
<field name="act_remind_partner"/> <field name="act_remind_partner"/>
<field name="act_remind_attach"/> <field name="act_remind_attach"/>
@ -71,19 +71,20 @@
<field colspan="4" name="act_mail_to_email"/> <field colspan="4" name="act_mail_to_email"/>
<field name="act_mail_to_watchers"/> <field name="act_mail_to_watchers"/>
<field colspan="4" name="act_email_cc"/> <field colspan="4" name="act_email_cc"/>
<separator colspan="4" string="Email Body"/> <separator colspan="4" string="Email Body"/>
<field colspan="4" name="act_mail_body" height="250" <field colspan="4" name="act_mail_body" height="250"
nolabel="1" attrs="{'required':[('act_remind_user','=',True)]}" /> nolabel="1" attrs="{'required':[('act_remind_user','=',True)]}" />
<separator colspan="4" string="Special Keywords to be Used in the Body"/> <separator colspan="4" string="Special Keywords to be Used in the Body"/>
<label align="0.0" string="%%(object_id)s = Object ID" colspan="2"/> <label align="0.0" string="%%(object_id)s = Object ID" colspan="2"/>
<label align="0.0" string="%%(object_subject)s = Object subject" colspan="2"/> <label align="0.0" string="%%(object_subject)s = Object subject" colspan="2"/>
<label align="0.0" string="%%(object_description)s = Object description" colspan="2"/> <label align="0.0" string="%%(object_description)s = Object description" colspan="2"/>
<label align="0.0" string="%%(object_date)s = Creation date" colspan="2"/> <label align="0.0" string="%%(object_date)s = Creation date" colspan="2"/>
<label align="0.0" string="%%(partner)s = Partner name" colspan="2"/> <label align="0.0" string="%%(partner)s = Partner name" colspan="2"/>
<label align="0.0" string="%%(partner_email)s = Partner Email" colspan="2"/> <label align="0.0" string="%%(partner_email)s = Partner Email" colspan="2"/>
<label align="0.0" string="%%(object_user)s = Responsible name" colspan="2"/> <label align="0.0" string="%%(object_user)s = Responsible name" colspan="2"/>
<label align="0.0" string="%%(object_user_email)s = Responsible Email" colspan="2"/> <label align="0.0" string="%%(object_user_email)s = Responsible Email" colspan="2"/>
<label align="0.0" string="%%(object_user_phone)s = Responsible phone" colspan="2"/> <label align="0.0" string="%%(object_user_phone)s = Responsible phone" colspan="2"/>
</group>
</page> </page>
</notebook> </notebook>
</form> </form>

223
addons/base_calendar/base_calendar_view.xml
View File

@ -8,58 +8,55 @@
<field name="model">calendar.attendee</field> <field name="model">calendar.attendee</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="Invitation details" version="7.0">
<header> <header>
<button name="do_tentative" <button name="do_tentative"
states="needs-action,declined,accepted" states="needs-action,declined,accepted"
string="Uncertain" type="object" string="Uncertain" type="object"/>
/>
<button name="do_accept" string="Accept" <button name="do_accept" string="Accept"
states="needs-action,tentative,declined" states="needs-action,tentative,declined"
type="object" /> type="object" />
<button <button
name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
string="Delegate" type="action" string="Delegate" type="action"
states="needs-action,tentative,declined,accepted" states="needs-action,tentative,declined,accepted"
context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" /> context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
<button name="do_decline" string="Decline" <button name="do_decline" string="Decline"
states="needs-action,tentative,accepted" states="needs-action,tentative,accepted"
type="object" /> type="object" />
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/> <field name="state" widget="statusbar"
statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
</header> </header>
<sheet string="Invitation details" layout="auto"> <sheet>
<group col="6" colspan="4"> <group col="4">
<field name="email" string="Invitation To"/> <field name="email" string="Invitation To"/>
<field name="cutype" string="Invitation Type" /> <field name="cutype" string="Invitation Type" />
<field name="rsvp" /> <field name="rsvp" />
<field name="role" string="Role" /> <field name="role" string="Role" />
<field name="sent_by_uid" string="Invitation From" /> <field name="sent_by_uid" string="Invitation From" />
</group> </group>
<notebook colspan="4"> <notebook>
<page string="Invitation"> <page string="Invitation">
<separator string="Invitation Detail" colspan="4" /> <group>
<group colspan="4" col="4"> <group string="Invitation Detail">
<field name="user_id" string="Invited User"/> <field name="user_id" string="Invited User"/>
<newline/> <field name="partner_id" string="Contact" />
<field name="partner_id" </group>
string="Contact" /> <group string="Event Detail">
</group> <field name="event_date" />
<separator string="Event Detail" colspan="4" /> <field name="event_end_date" />
<group colspan="4" col="4"> <field name="language"/>
<field name="event_date" /> <field name="ref" readonly="1"/>
<field name="event_end_date" /> </group>
<field name="language"/>
<field name="ref" colspan="4" readonly="1"/>
</group> </group>
</page> </page>
<page string="Delegation Info"> <page string="Delegation Info">
<separator string="Delegated From" colspan="4" /> <separator string="Delegated From" colspan="4" />
<field name="parent_ids" nolabel="1" <field name="parent_ids"
colspan="4" readonly="1" /> readonly="1" />
<separator string="Delegated To" colspan="4" /> <separator string="Delegated To" colspan="4" />
<field name="child_ids" nolabel="1" <field name="child_ids"
colspan="4" readonly="1" /> readonly="1" />
</page> </page>
</notebook> </notebook>
</sheet> </sheet>
@ -159,14 +156,16 @@
<field name="model">res.alarm</field> <field name="model">res.alarm</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Reminder details"> <form string="Reminder details" version="7.0">
<field name="name" /> <group col="4">
<field name="active" /> <field name="name" />
<separator string="Reminder Details" colspan="4" /> <field name="active" />
<field name="trigger_duration" select="1" /> <separator string="Reminder Details" colspan="4" />
<field name="trigger_interval" select="1" /> <field name="trigger_duration" />
<field name="trigger_occurs" select="1" /> <field name="trigger_interval" />
<field name="trigger_related" select="1" /> <field name="trigger_occurs" />
<field name="trigger_related" />
</group>
</form> </form>
</field> </field>
</record> </record>
@ -179,11 +178,11 @@
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Reminder details"> <tree string="Reminder details">
<field name="name" select="1"/> <field name="name"/>
<field name="trigger_interval" select="1"/> <field name="trigger_interval"/>
<field name="trigger_duration" select="1"/> <field name="trigger_duration"/>
<field name="trigger_occurs" select="1"/> <field name="trigger_occurs"/>
<field name="trigger_related" select="1"/> <field name="trigger_related"/>
</tree> </tree>
</field> </field>
</record> </record>
@ -210,7 +209,7 @@
<field name="model">calendar.event</field> <field name="model">calendar.event</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="Events" version="7.0">
<header> <header>
<button name="do_confirm" <button name="do_confirm"
string="Confirm" string="Confirm"
@ -227,15 +226,16 @@
states="tentative,confirmed" states="tentative,confirmed"
type="object" type="object"
/> />
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/> <field name="state" widget="statusbar"
statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
</header> </header>
<sheet string="Events" layout="auto"> <sheet>
<group col="6" colspan="4"> <group col="6">
<field name="name" select="1" string="Summary" <field name="name" string="Summary"
colspan="4" required="1" /> colspan="4" required="1" />
<field name="allday" colspan="2" on_change="onchange_dates(date,False,False,allday)" /> <field name="allday" colspan="2" on_change="onchange_dates(date,False,False,allday)" />
<newline/> <newline/>
<field name="date" string="Start Date" required="1" select="1" <field name="date" string="Start Date" required="1"
on_change="onchange_dates(date,duration,False,allday)" /> on_change="onchange_dates(date,duration,False,allday)" />
<field name="duration" widget="float_time" <field name="duration" widget="float_time"
on_change="onchange_dates(date,duration,False,allday)" attrs="{'invisible': [('allday', '=', True)]}"/> on_change="onchange_dates(date,duration,False,allday)" attrs="{'invisible': [('allday', '=', True)]}"/>
@ -248,7 +248,7 @@
<field name="recurrency"/> <field name="recurrency"/>
</group> </group>
</group> </group>
<notebook colspan="4"> <notebook>
<page string="Event"> <page string="Event">
<group col="6" colspan="4"> <group col="6" colspan="4">
<separator colspan="6" string="Visibility"/> <separator colspan="6" string="Visibility"/>
@ -258,73 +258,74 @@
<field name="recurrent_id" invisible="1" /> <field name="recurrent_id" invisible="1" />
<field name="recurrent_uid" invisible="1" /> <field name="recurrent_uid" invisible="1" />
</group> </group>
<separator string="Description" colspan="4" /> <separator string="Description"/>
<field name="description" nolabel="1" colspan="4" /> <field name="description"/>
</page> </page>
<page string="Invitation Detail"> <page string="Invitation Detail">
<button string="Invite People" <button string="Invite People"
name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
icon="terp-partner" type="action" icon="terp-partner" type="action"
context="{'model' : 'calendar.event', 'attendee_field':'attendee_ids'}" colspan="2"/> context="{'model' : 'calendar.event', 'attendee_field':'attendee_ids'}" colspan="2"/>
<field name="attendee_ids" colspan="4" <field name="attendee_ids" colspan="4"
nolabel="1" widget="one2many" mode="tree,form"> nolabel="1" widget="one2many" mode="tree,form">
<tree string="Invitation details" editable="top"> <tree string="Invitation details" editable="top">
<field name="sent_by_uid" string="From"/> <field name="sent_by_uid" string="From"/>
<field name="user_id" string="To"/> <field name="user_id" string="To"/>
<field name="email" /> <field name="email" />
<field name="role" width="200" select="1" /> <field name="role" width="200" />
<field name="state" /> <field name="state" />
<button name="do_tentative" <button name="do_tentative"
states="needs-action,declined,accepted" states="needs-action,declined,accepted"
string="Uncertain" type="object" string="Uncertain" type="object"
icon="terp-crm" /> icon="terp-crm" />
<button name="do_accept" string="Accept" <button name="do_accept" string="Accept"
states="needs-action,tentative,declined" states="needs-action,tentative,declined"
type="object" icon="gtk-apply" /> type="object" icon="gtk-apply" />
<button name="do_decline" string="Decline" <button name="do_decline" string="Decline"
states="needs-action,tentative,accepted" states="needs-action,tentative,accepted"
type="object" icon="gtk-cancel" /> type="object" icon="gtk-cancel" />
<button <button
name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
string="Delegate" type="action" string="Delegate" type="action"
icon="gtk-sort-descending" icon="gtk-sort-descending"
states="needs-action,tentative,declined,accepted" states="needs-action,tentative,declined,accepted"
context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" /> context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
</tree> </tree>
<form string="Invitation details"> <form string="Invitation details" version="7.0">
<notebook colspan="4"> <notebook colspan="4">
<page string="Details"> <page string="Details">
<group col="4">
<field name="email" /> <field name="email" />
<field name="rsvp" select="1" /> <field name="rsvp"/>
<field name="cutype" select="1" /> <field name="cutype"/>
<field name="role" select="1" /> <field name="role"/>
<separator colspan="4" string="" /> </group>
<group col="6" colspan="4"> <group col="4">
<field name="state" select="2" /> <field name="state"/>
<button name="do_tentative" <button name="do_tentative"
states="needs-action,declined,accepted" states="needs-action,declined,accepted"
string="Uncertain" string="Uncertain"
type="object" type="object"
icon="terp-crm" /> icon="terp-crm" />
<button name="do_accept" <button name="do_accept"
string="Accept" string="Accept"
states="needs-action,tentative,declined" states="needs-action,tentative,declined"
type="object" type="object"
icon="gtk-apply" /> icon="gtk-apply" />
<button name="do_decline" <button name="do_decline"
string="Decline" string="Decline"
states="needs-action,tentative,accepted" states="needs-action,tentative,accepted"
type="object" type="object"
icon="gtk-cancel" /> icon="gtk-cancel" />
<button <button
name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
string="Delegate" string="Delegate"
type="action" type="action"
icon="gtk-sort-descending" icon="gtk-sort-descending"
states="needs-action,tentative,declined,accepted" states="needs-action,tentative,declined,accepted"
context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" /> context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
</group> </group>
</page> </page>
</notebook> </notebook>
</form> </form>
</field> </field>

48
addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
View File

@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<!-- Attendee invite wizard--> <!-- Attendee invite wizard-->
<record id="view_calendar_invite_attendee_wizard" <record id="view_calendar_invite_attendee_wizard"
model="ir.ui.view"> model="ir.ui.view">
<field name="name">Invite Attendees</field> <field name="name">Invite Attendees</field>
<field name="model">base_calendar.invite.attendee</field> <field name="model">base_calendar.invite.attendee</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Invite People"> <form string="Invite People">
<separator string="Invite People" colspan="4"/> <separator string="Invite People" colspan="4"/>
<field name="type"/> <field name="type"/>
<field name="send_mail"/> <field name="send_mail"/>
<notebook colspan="4"> <notebook colspan="4">
<page string="Data"> <page string="Data">
<group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'external')]}"> <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'external')]}">
@ -35,21 +35,21 @@
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button name="do_invite" string="Invite" type="object" icon="gtk-ok"/> <button name="do_invite" string="Invite" type="object" icon="gtk-ok"/>
</group> </group>
</form> </form>
</field> </field>
</record> </record>
<!-- Attendee invite action--> <!-- Attendee invite action-->
<record id="action_view_calendar_invite_attendee_wizard" model="ir.actions.act_window"> <record id="action_view_calendar_invite_attendee_wizard" model="ir.actions.act_window">
<field name="name">Invite Attendees</field> <field name="name">Invite Attendees</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="res_model">base_calendar.invite.attendee</field> <field name="res_model">base_calendar.invite.attendee</field>
<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>
</data> </data>
</openerp> </openerp>

11
addons/base_module_quality/README.txt
View File

@ -1,11 +0,0 @@
This module provide a generic framework to define your own quality test.
All you have to do is to:
* create a folder with your test in 'base_module_quality' (e.g: mkdir base_module_quality\mytest)
* create a .py file in it with same name as the folder you just created (e.g: touch base_module_quality\mytest\mytest.py)
* edit your file and define a class 'quality_check' that
* inherits the class 'abstract_quality_test' (defined in base_module_quality.py)
* implements the __init__() method accordingly to what you want to test.

25
addons/base_module_quality/__init__.py
View File

@ -1,25 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import base_module_quality
import wizard
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

52
addons/base_module_quality/__openerp__.py
View File

@ -1,52 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
{
'name': 'Analyse Module Quality' ,
'version': '1.0',
'category': 'Tools',
'description': """
The aim of this module is to check the quality of other modules.
================================================================
It defines a wizard on the list of modules in OpenERP, which allows you to
evaluate them on different criteria such as: the respect of OpenERP coding
standards, the speed efficiency...
This module also provides generic framework to define your own quality test.
For further info, coders may take a look into base_module_quality\README.txt
WARNING: This module cannot work as a ZIP file, you must unzip it before
using it, otherwise it may crash.
""",
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'depends': ['base'],
'init_xml': [],
'update_xml': ['wizard/module_quality_check_view.xml', 'wizard/quality_save_report_view.xml', 'base_module_quality_view.xml', 'security/ir.model.access.csv'],
'demo_xml': [],
'installable': True,
'auto_install': False,
'certificate': '0175119475677',
'images': ['images/base_module_quality1.jpeg','images/base_module_quality2.jpeg','images/base_module_quality3.jpeg']
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

304
addons/base_module_quality/base_module_quality.py
View File

@ -1,304 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
import os
import pooler
from tools.translate import _
from osv import osv, fields
import logging
import addons
class abstract_quality_check(object):
'''
This Class is abstract class for all test
'''
def __init__(self):
'''
this method should initialize the variables
'''
#This float have to store the rating of the module.
#Used to compute the final score (average of all scores).
#0 <= self.score <= 1
self.score = 0.0
#This char have to store the name of the test.
self.name = ""
#This char have to store the aim of the test and eventually a note.
self.note = ""
#This char have to store the result.
#Used to display the result of the test.
self.result = ""
#This char have to store the result with more details.
#Used to provide more details if necessary.
self.result_details = ""
# This boolean variable defines that if you do not want to calculate score and just only need detail
# or summary report for some test then you will make it False.
self.bool_count_score = True
#This bool defines if the test can be run only if the module
#is installed.
#True => the module have to be installed.
#False => the module can be uninstalled.
self.bool_installed_only = True
#This variable is used to give result of test more weight,
#because some tests are more critical than others.
self.ponderation = 1.0
#Specify test got an error on module
self.error = False
#Specify the minimal score for the test (in percentage(%))
self.min_score = 50
#Specify whether test should be consider for Quality checking of the module
self.active = True
#This variable used to give message if test result is good or not
self.message = ''
self.log = logging.getLogger('module.quality')
#The tests have to subscribe itselfs in this list, that contains
#all the test that have to be performed.
self.tests = []
module_path = addons.get_module_path('base_module_quality')
for item in os.listdir(module_path):
path = module_path + '/' + item
if os.path.isdir(path) and os.path.exists(path + '/' + item + '.py') and item not in ['report', 'wizard', 'security']:
item2 = 'base_module_quality.' + item +'.' + item
x_module = __import__(item2)
x_file = getattr(x_module, item)
x_obj = getattr(x_file, item)
self.tests.append(x_obj)
def run_test(self, cr, uid, module_path=""):
'''
this method should do the test and fill the score, result and result_details var
'''
raise osv.except_osv(_('Programming Error'), _('Test Is Not Implemented'))
def get_objects(self, cr, uid, module):
# This function returns all object of the given module..
pool = pooler.get_pool(cr.dbname)
ids2 = pool.get('ir.model.data').search(cr, uid,
[('module', '=', module), ('model', '=', 'ir.model')])
model_list = []
model_data = pool.get('ir.model.data').browse(cr, uid, ids2)
for model in model_data:
model_list.append(model.res_id)
self.log.debug('get_objects() model_list: %s', ','.join(map(str, model_list)))
obj_list = []
for mod in pool.get('ir.model').browse(cr, uid, model_list):
obj_list.append(str(mod.model))
self.log.debug('get_objects() obj_list: %s', ','.join(obj_list))
return obj_list
def get_model_ids(self, cr, uid, models=[]):
# This function returns all ids of the given objects..
if not models:
return []
pool = pooler.get_pool(cr.dbname)
self.log.debug('get_model_ids([%s])', ', '.join(models))
return pool.get('ir.model').search(cr, uid, [('model', 'in', models)])
def get_ids(self, cr, uid, object_list):
#This method return dictionary with ids of records of object for module
pool = pooler.get_pool(cr.dbname)
result_ids = {}
for obj in object_list:
ids = pool.get(obj).search(cr, uid, [])
ids = filter(lambda id: id != None, ids or [])
result_ids[obj] = ids
return result_ids
def format_table(self, header=[], data_list={}): #This function can work forwidget="text_wiki"
detail = ""
detail += (header[0]) % tuple(header[1])
frow = '\n|-'
for i in header[1]:
frow += '\n| %s'
for key, value in data_list.items():
detail += (frow) % tuple(value)
detail = detail + '\n|}'
return detail
def format_html_table(self, header=[], data_list=[]): #This function can work for widget="html_tag"
# function create html table....
detail = ""
detail += (header[0]) % tuple(header[1])
frow = '<tr>'
for i in header[1]:
frow += '<td>%s</td>'
frow += '</tr>'
for key, value in data_list.items():
detail += (frow) % tuple(value)
return detail
def add_quatation(self, x_no, y_no):
return x_no/y_no
def get_style(self):
# This function return style tag with specified styles for html pages
style = '''
<style>
.divstyle {
border:1px solid #aaaaaa;
background-color:#f9f9f9;
padding:5px;
}
.tablestyle
{
border:1px dashed gray;
}
.tdatastyle
{
border:0.5px solid gray;
}
.head
{
color: black;
background: none;
font-weight: normal;
margin: 0;
padding-top: .5em;
padding-bottom: .17em;
border-bottom: 1px solid #aaa;
}
}
</style> '''
return style
class module_quality_check(osv.osv):
_name = 'module.quality.check'
_columns = {
'name': fields.char('Rated Module', size=64, ),
'final_score': fields.char('Final Score (%)', size=10,),
'check_detail_ids': fields.one2many('module.quality.detail', 'quality_check_id', 'Tests',)
}
def check_quality(self, cr, uid, module_name, module_state=None):
'''
This function will calculate score of openerp module
It will return data in below format:
Format: {'final_score':'80.50', 'name': 'sale',
'check_detail_ids':
[(0,0,{'name':'workflow_test', 'score':'100', 'ponderation':'0', 'summary': text_wiki format data, 'detail': html format data, 'state':'done', 'note':'XXXX'}),
((0,0,{'name':'terp_test', 'score':'60', 'ponderation':'1', 'summary': text_wiki format data, 'detail': html format data, 'state':'done', 'note':'terp desctioption'}),
..........]}
So here the detail result is in html format and summary will be in text_wiki format.
'''
pool = pooler.get_pool(cr.dbname)
log = logging.getLogger('module.quality')
obj_module = pool.get('ir.module.module')
if not module_state:
module_id = obj_module.search(cr, uid, [('name', '=', module_name)])
if module_id:
module_state = obj_module.browse(cr, uid, module_id[0]).state
abstract_obj = abstract_quality_check()
score_sum = 0.0
ponderation_sum = 0.0
create_ids = []
module_path = addons.get_module_path(module_name)
log.info('Performing quality tests for %s', module_name)
for test in abstract_obj.tests:
val = test.quality_test()
if not val.active:
log.info('Skipping inactive step %s for %s', val.name, module_name)
continue
log.info('Performing step %s for %s', val.name, module_name)
# Get a separate cursor per test, so that an SQL error in one
# will not block the others.
cr2 = pooler.get_db(cr.dbname).cursor()
try:
if not val.bool_installed_only or module_state == "installed":
val.run_test(cr2, uid, str(module_path))
if not val.error:
data = {
'name': val.name,
'score': val.score * 100,
'ponderation': val.ponderation,
'summary': val.result,
'detail': val.result_details,
'state': 'done',
'note': val.note,
'message': val.message
}
if val.bool_count_score:
score_sum += val.score * val.ponderation
ponderation_sum += val.ponderation
else:
data = {
'name': val.name,
'score': 0,
'summary': val.result,
'state': 'skipped',
'note': val.note,
}
else:
data = {
'name': val.name,
'note': val.note,
'score': 0,
'state': 'skipped',
'summary': _("The module has to be installed before running this test.")
}
create_ids.append((0, 0, data))
log.info('Finished quality test step')
except Exception, e:
log.exception("Could not finish test step %s due to %s", val.name, e)
finally:
cr2.rollback()
cr2.close()
final_score = ponderation_sum and '%.2f' % (score_sum / ponderation_sum * 100) or 0
data = {
'name': module_name,
'final_score': final_score,
'check_detail_ids' : create_ids,
}
return data
module_quality_check()
class module_quality_detail(osv.osv):
_name = 'module.quality.detail'
_columns = {
'quality_check_id': fields.many2one('module.quality.check', 'Quality'),
'name': fields.char('Name',size=128),
'score': fields.float('Score (%)'),
'ponderation': fields.float('Ponderation', help='Some tests are more critical than others, so they have a bigger weight in the computation of final rating'),
'note': fields.text('Note'),
'summary': fields.text('Summary'),
'detail': fields.text('Details'),
'message': fields.char('Message', size=64),
'state': fields.selection([('done','Done'),('skipped','Skipped'),], 'Status', size=24, help='The test will be completed only if the module is installed or if the test may be processed on uninstalled module.'),
}
module_quality_detail()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

71
addons/base_module_quality/base_module_quality_view.xml
View File

@ -1,71 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_wizard_quality_check_tree" model="ir.ui.view">
<field name="name">Results of Quality Checks</field>
<field name="model">module.quality.check</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Result">
<field name="name"/>
<field name="final_score"/>
</tree>
</field>
</record>
<record id="view_wizard_quality_check_form" model="ir.ui.view">
<field name="name">Results of Quality Checks</field>
<field name="model">module.quality.check</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Result">
<field name="name" readonly="1" search="1"/>
<field name="final_score" readonly="1" search="1"/>
<separator colspan="4" string="Tests"/>
<field name="check_detail_ids" nolabel="1" colspan="4" height="350" width="800" readonly="1">
</field>
</form>
</field>
</record>
<record id="view_wizard_quality_detail_form" model="ir.ui.view">
<field name="name">Results of Quality Checks with detail</field>
<field name="model">module.quality.detail</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Result">
<notebook>
<page string="Summary">
<field name="name" readonly="1"/>
<field name="score" readonly="1"/>
<field name="note" readonly="1" colspan="4"/>
<field name="summary" widget="text_wiki" nolabel="1" colspan="4" height="350" width="800" readonly="1"/>
<field name="ponderation" readonly="1"/>
<field name="state" readonly="1"/>
</page>
<page string="Detail">
<button name="%(action_view_quality_save_report)d" string="Save Report" type="action"/>
<field name="detail" widget="text_html" nolabel="1" colspan="4" readonly="1"/>
</page>
</notebook>
</form>
</field>
</record>
<record id="view_wizard_quality_detail_tree" model="ir.ui.view">
<field name="name">Results of Quality Checks with detail</field>
<field name="model">module.quality.detail</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Result">
<field name="name" required="1"/>
<field name="state"/>
<field name="score" required="1"/>
<field name="ponderation"/>
<field name="message" />
</tree>
</field>
</record>
</data>
</openerp>

BIN
addons/base_module_quality/document/quality.doc
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More