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

[MERGE] merged with the trunk 

bzr revid: qdp-launchpad@openerp.com-20120611124211-kf741tkd3gdsp3ep
This commit is contained in:
Quentin (OpenERP) 2012-06-11 14:42:11 +02:00
parent 3692c1dd14 755fc6c38b
commit 204ce4380a
680 changed files with 18364 additions and 169395 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>

338
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,97 @@
<!--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"/> <field name="state" class="oe_form_inline"/>
<field name="number"/> <field name="number"/>
</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"> <group>
<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 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"/>
</group>
<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 +391,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>

1161
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')]"/>

98
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-01 01:29+0000\n" "PO-Revision-Date: 2012-06-08 01:32+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-02 05:35+0000\n" "X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
"X-Generator: Launchpad (build 15342)\n" "X-Generator: Launchpad (build 15376)\n"
#. module: account #. module: account
#: view:account.invoice.report:0 #: view:account.invoice.report:0
@ -38,7 +38,7 @@ msgstr "その他の設定"
msgid "" msgid ""
"Determine the display order in the report 'Accounting \\ Reporting \\ " "Determine the display order in the report 'Accounting \\ Reporting \\ "
"Generic Reporting \\ Taxes \\ Taxes Report'" "Generic Reporting \\ Taxes \\ Taxes Report'"
msgstr "会計 \\ レポート \\ 一般的なレポート \\ 税金 \\ 税金レポート にあるレポートの表示順を決定して下さい。" msgstr "会計 \\ レポート \\ 一般的なレポート \\ 税金 \\ 税金レポート にあるレポートの表示順を決定します。"
#. module: account #. module: account
#: view:account.move.reconcile:0 #: view:account.move.reconcile:0
@ -201,8 +201,8 @@ msgid ""
"invoice) to create analytic entries, OpenERP will look for a matching " "invoice) to create analytic entries, OpenERP will look for a matching "
"journal of the same type." "journal of the same type."
msgstr "" msgstr ""
"分析仕訳帳のタイプを与えて下さい。分析エントリーを作成するためのドキュメント（例えば請求書）のために必要な場合、OpenERPは同じタイプの一致する仕訳帳" "分析仕訳帳のタイプを与えます。分析エントリーを作成するためのドキュメント（例えば請求書）のために必要な場合、OpenERPは同じタイプの一致する仕訳帳を探"
"を探します。" "します。"
#. module: account #. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_template_form #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@ -1086,7 +1086,7 @@ msgstr "並べ替え順"
#. module: account #. module: account
#: help:account.fiscalyear.close,fy_id:0 #: help:account.fiscalyear.close,fy_id:0
msgid "Select a Fiscal year to close" msgid "Select a Fiscal year to close"
msgstr "閉じる会計年度を選択して下さい。" msgstr "閉じるには会計年度を選択します。"
#. module: account #. module: account
#: help:account.account.template,user_type:0 #: help:account.account.template,user_type:0
@ -1476,7 +1476,7 @@ msgstr "桁数"
#. module: account #. module: account
#: field:account.journal,entry_posted:0 #: field:account.journal,entry_posted:0
msgid "Skip 'Draft' State for Manual Entries" msgid "Skip 'Draft' State for Manual Entries"
msgstr "手動入力のため、ドラフト状態をスキップして下さい。" msgstr "手動入力のため、ドラフト状態をスキップします。"
#. module: account #. module: account
#: view:account.invoice.report:0 #: view:account.invoice.report:0
@ -1674,7 +1674,7 @@ msgstr "アカウントタイプ別売上"
msgid "" msgid ""
"Cancel Invoice: Creates the refund invoice, validate and reconcile it to " "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
"cancel the current invoice." "cancel the current invoice."
msgstr "請求書のキャンセル：現在の請求書をキャンセルするために返金請求書を作成、検証、消し込みして下さい。" msgstr "請求書のキャンセル：現在の請求書をキャンセルするために返金請求書を作成、検証、消し込みします。"
#. module: account #. module: account
#: model:ir.ui.menu,name:account.periodical_processing_invoicing #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@ -2425,7 +2425,7 @@ msgstr "基本コード"
#. module: account #. module: account
#: help:account.invoice.tax,sequence:0 #: help:account.invoice.tax,sequence:0
msgid "Gives the sequence order when displaying a list of invoice tax." msgid "Gives the sequence order when displaying a list of invoice tax."
msgstr "請求書の税金のリストを表示する時に、並べ順を指定して下さい。" msgstr "請求書の税金のリストを表示する時に、並べ順を与えます。"
#. module: account #. module: account
#: field:account.tax,base_sign:0 #: field:account.tax,base_sign:0
@ -2445,9 +2445,9 @@ msgid ""
"useful because it enables you to preview at any time the tax that you owe at " "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." "the start and end of the month or quarter."
msgstr "" msgstr ""
"このメニューは請求書または支払いに基づく消費税申告を印刷します。ひとつあるいは複数の会計年度を選択して下さい。税金申請のために要求される情報は請求書（また" "このメニューは請求書または支払いに基づく消費税申告を印刷します。ひとつあるいは複数の会計年度を選択します。税金申請のために要求される情報は請求書（または支"
"は支払い、幾つかの国の）からOpenERPによって自動的に生成されます。このデータはリアルタイムで更新されます。月あるいは四半期の開始と終了において、支払" "払い、幾つかの国の）からOpenERPによって自動的に生成されます。このデータはリアルタイムで更新されます。月あるいは四半期の開始と終了において、支払うべ"
"うべき税金をいつでもレビューできるため非常に便利です。" "き税金をいつでもレビューできるため非常に便利です。"
#. module: account #. module: account
#: selection:account.move.line,centralisation:0 #: selection:account.move.line,centralisation:0
@ -2722,8 +2722,7 @@ msgid ""
"Note that journal entries that are automatically created by the system are " "Note that journal entries that are automatically created by the system are "
"always skipping that state." "always skipping that state."
msgstr "" msgstr ""
"新しい仕訳帳エントリーがドラフト状態を通り抜けて、代わりに手動での検証を行わず直接記帳状態に行くことを望まない場合は、このボックスをチェックして下さい。" "新しい仕訳帳エントリーがドラフト状態を通り抜けて、代わりに手動での検証を行わず直接記帳状態に行くことを望まない場合は、このボックスをチェックします。\n"
"\n"
"システムにより自動的に作成された仕訳帳エントリーはいつもこの状態をスキップすることに注意して下さい。" "システムにより自動的に作成された仕訳帳エントリーはいつもこの状態をスキップすることに注意して下さい。"
#. module: account #. module: account
@ -2847,7 +2846,7 @@ msgstr "費用勘定"
#. module: account #. module: account
#: help:account.invoice,period_id:0 #: help:account.invoice,period_id:0
msgid "Keep empty to use the period of the validation(invoice) date." msgid "Keep empty to use the period of the validation(invoice) date."
msgstr "検証（請求書）日の期間を使うために空のままにして下さい。" msgstr "検証（請求書）日の期間を使うために空のままにします。"
#. module: account #. module: account
#: help:account.bank.statement,account_id:0 #: help:account.bank.statement,account_id:0
@ -3162,7 +3161,7 @@ msgid ""
" 'Unreconciled' will copy only the journal items that were unreconciled on " " 'Unreconciled' will copy only the journal items that were unreconciled on "
"the first day of the new fiscal year." "the first day of the new fiscal year."
msgstr "" msgstr ""
"このタイプの全てのアカウントの年間の仕訳帳エントリーの終わりを生成するのに使用する方法を、ここで設定して下さい。\n" "このタイプの全てのアカウントの年間の仕訳帳エントリーの終わりを生成するのに使用する方法を、ここで設定します。\n"
"\n" "\n"
"　\"なし\" は何も行われないことを意味します。\n" "　\"なし\" は何も行われないことを意味します。\n"
"　\"残高\"は一般的には現金のアカウントのために使用されます。\n" "　\"残高\"は一般的には現金のアカウントのために使用されます。\n"
@ -3179,7 +3178,7 @@ msgstr "その会計年度の終わりの仕訳帳が定義されていません
#: view:account.tax:0 #: view:account.tax:0
#: view:account.tax.template:0 #: view:account.tax.template:0
msgid "Keep empty to use the expense account" msgid "Keep empty to use the expense account"
msgstr "費用勘定を使うためには空のままとして下さい。" msgstr "費用勘定を使うためには空のままとします。"
#. module: account #. module: account
#: field:account.aged.trial.balance,journal_ids:0 #: field:account.aged.trial.balance,journal_ids:0
@ -4118,7 +4117,7 @@ msgstr "貸借対照表（負債勘定）"
#. module: account #. module: account
#: help:account.invoice,date_invoice:0 #: help:account.invoice,date_invoice:0
msgid "Keep empty to use the current date" msgid "Keep empty to use the current date"
msgstr "現在日付を利用するには空のままとして下さい。" msgstr "現在日付を利用するには空のままとします。"
#. module: account #. module: account
#: field:account.invoice,tax_line:0 #: field:account.invoice,tax_line:0
@ -4327,8 +4326,8 @@ msgid ""
"you want to generate accounts of this template only when loading its child " "you want to generate accounts of this template only when loading its child "
"template." "template."
msgstr "" msgstr ""
"テンプレートから勘定科目表を生成するウィザードの中でこのテンプレートを積極的に使わないのであれば、Falseを設定して下さい。これは子のテンプレートをロー" "テンプレートから勘定科目表を生成するウィザードの中でこのテンプレートを積極的に使わないのであれば、Falseを設定します。これは子のテンプレートをロードし"
"ドするときだけ、このテンプレートのアカウントを生成するときに役立ちます。" "た時のみでこのテンプレートのアカウントを生成したい時に役立ちます。"
#. module: account #. module: account
#: view:account.use.model:0 #: view:account.use.model:0
@ -4445,7 +4444,7 @@ msgstr ""
#: view:account.tax:0 #: view:account.tax:0
#: view:account.tax.template:0 #: view:account.tax.template:0
msgid "Keep empty to use the income account" msgid "Keep empty to use the income account"
msgstr "収益勘定を使うためは空のままとして下さい。" msgstr "収益勘定を使うためは空のままとします。"
#. module: account #. module: account
#: code:addons/account/account.py:3299 #: code:addons/account/account.py:3299
@ -4792,7 +4791,7 @@ msgstr "会計士"
msgid "" msgid ""
"From this view, have an analysis of your treasury. It sums the balance of " "From this view, have an analysis of your treasury. It sums the balance of "
"every accounting entries made on liquidity accounts per period." "every accounting entries made on liquidity accounts per period."
msgstr "このビューから財務分析を行って下さい。これは期間毎に流動資産アカウント上に作られた全ての会計エントリーの残高を合計します。" msgstr "このビューから財務分析を行います。これは期間毎に流動資産アカウント上に作られた全ての会計エントリーの残高を合計します。"
#. module: account #. module: account
#: field:account.journal,group_invoice_lines:0 #: field:account.journal,group_invoice_lines:0
@ -5172,7 +5171,7 @@ msgstr "取引"
#: help:account.tax.template,ref_tax_code_id:0 #: help:account.tax.template,ref_tax_code_id:0
#: help:account.tax.template,tax_code_id:0 #: help:account.tax.template,tax_code_id:0
msgid "Use this code for the VAT declaration." msgid "Use this code for the VAT declaration."
msgstr "消費税申請にこのコードを使って下さい。" msgstr "消費税申請にこのコードを使います。"
#. module: account #. module: account
#: field:account.partner.reconcile.process,progress:0 #: field:account.partner.reconcile.process,progress:0
@ -5220,7 +5219,7 @@ msgstr "エントリー制御"
#: view:account.analytic.chart:0 #: view:account.analytic.chart:0
#: view:project.account.analytic.line:0 #: view:project.account.analytic.line:0
msgid "(Keep empty to open the current situation)" msgid "(Keep empty to open the current situation)"
msgstr "（現在の状態を開くために空のままとして下さい）" msgstr "（現在の状態を開くために空のままとします）"
#. module: account #. module: account
#: field:account.analytic.balance,date1:0 #: field:account.analytic.balance,date1:0
@ -5954,7 +5953,7 @@ msgstr ""
#. module: account #. module: account
#: view:account.invoice:0 #: view:account.invoice:0
msgid "(keep empty to use the current period)" msgid "(keep empty to use the current period)"
msgstr "（今期を使う場合は空のままとして下さい）" msgstr "（現在の期間を使う場合は空のままとします）"
#. module: account #. module: account
#: model:process.transition,note:account.process_transition_supplierreconcilepaid0 #: model:process.transition,note:account.process_transition_supplierreconcilepaid0
@ -6465,7 +6464,7 @@ msgstr "エントリー： "
#. module: account #. module: account
#: view:account.use.model:0 #: view:account.use.model:0
msgid "Create manual recurring entries in a chosen journal." msgid "Create manual recurring entries in a chosen journal."
msgstr "選択された仕訳帳の中に手動で定期エントリーを作成して下さい。" msgstr "選択された仕訳帳の中に手動の定期エントリーを作成します。"
#. module: account #. module: account
#: help:res.partner.bank,currency_id:0 #: help:res.partner.bank,currency_id:0
@ -6941,8 +6940,8 @@ msgid ""
"accounting application of OpenERP, journals and accounts will be created " "accounting application of OpenERP, journals and accounts will be created "
"automatically based on these data." "automatically based on these data."
msgstr "" msgstr ""
"会社の銀行口座を設定して、そしてレポートフッターに現れるべきそれを選択して下さい。リストビューの中の銀行を並べ替えることが出来ます。OpenERPの会計ア" "会社の銀行口座を設定して、そしてレポートフッターに現れるべきそれを選択します。リストビューの中の銀行を並べ替えることが出来ます。OpenERPの会計アプリ"
"プリケーションを使用する場合は、仕訳帳とアカウントはそれらのデータを基に自動的に作成されます。" "ケーションを使用する場合は、仕訳帳とアカウントはそれらのデータを基に自動的に作成されます。"
#. module: account #. module: account
#: model:process.transition,note:account.process_transition_invoicemanually0 #: model:process.transition,note:account.process_transition_invoicemanually0
@ -7001,7 +7000,7 @@ msgstr "税金："
#. module: account #. module: account
#: help:account.tax,amount:0 #: help:account.tax,amount:0
msgid "For taxes of type percentage, enter % ratio between 0-1." msgid "For taxes of type percentage, enter % ratio between 0-1."
msgstr "税金はパーセンテージタイプのため、0から1の間の%比率を入力して下さい。" msgstr "税金はパーセンテージタイプのため、0から1の間の%比率を入力します。"
#. module: account #. module: account
#: model:ir.actions.act_window,help:account.action_subscription_form #: model:ir.actions.act_window,help:account.action_subscription_form
@ -7125,7 +7124,7 @@ msgid ""
"You can search for individual account entries through useful information. To " "You can search for individual account entries through useful information. To "
"search for account entries, open a journal, then select a record line." "search for account entries, open a journal, then select a record line."
msgstr "" msgstr ""
"有益な情報を介して個別のアカウントエントリーのための検索ができます。アカウントエントリーの検索のためには仕訳帳を開き、そしてレコード行を選択して下さい。" "有益な情報を介して個別のアカウントエントリーのための検索ができます。アカウントエントリーの検索のためには仕訳帳を開き、そしてレコード行を選択します。"
#. module: account #. module: account
#: view:account.entries.report:0 #: view:account.entries.report:0
@ -7135,7 +7134,7 @@ msgstr "記帳済エントリー"
#. module: account #. module: account
#: help:account.payment.term.line,value_amount:0 #: help:account.payment.term.line,value_amount:0
msgid "For percent enter a ratio between 0-1." msgid "For percent enter a ratio between 0-1."
msgstr "パーセントは0から1までの比率を入力して下さい。" msgstr "パーセントは0から1までの比率を入力します。"
#. module: account #. module: account
#: report:account.invoice:0 #: report:account.invoice:0
@ -7183,8 +7182,7 @@ msgid ""
"new counterpart but will share the same counterpart. This is used in fiscal " "new counterpart but will share the same counterpart. This is used in fiscal "
"year closing." "year closing."
msgstr "" msgstr ""
"この仕訳帳の各エントリーは新しい相手方を作成しないが、同じ相手方を共有することを決定するために、このボックスをチェックして下さい。これは会計年度決算時に使" "この仕訳帳の各エントリーが新しい相手方を作成せずに同じ相手方を共有すると決めるには、このボックスをチェックします。これは会計年度決算時に使われます。"
"われます。"
#. module: account #. module: account
#: field:account.bank.statement,closing_date:0 #: field:account.bank.statement,closing_date:0
@ -7328,7 +7326,7 @@ msgid ""
"Tax related to this account and the counter-part \"Account Payable\"." "Tax related to this account and the counter-part \"Account Payable\"."
msgstr "" msgstr ""
"このビューはOpenERPで大量のエントリーを記録するために会計士によって使用されます。仕入先請求書を記録することを望む場合、費用勘定の行を記録することに" "このビューはOpenERPで大量のエントリーを記録するために会計士によって使用されます。仕入先請求書を記録することを望む場合、費用勘定の行を記録することに"
"より開始して下さい。OpenERPは自動的にこのアカウントと相手方の買掛金に関連した税金を提案します" "より開始します。OpenERPは自動的にこのアカウントと相手方の買掛金に関連した税金を提案します。"
#. module: account #. module: account
#: view:account.invoice.line:0 #: view:account.invoice.line:0
@ -7727,7 +7725,7 @@ msgid ""
"it's based on the beginning of the month)." "it's based on the beginning of the month)."
msgstr "" msgstr ""
"月の日は、今月の最後の日とするには-" "月の日は、今月の最後の日とするには-"
"1を設定して下さい。もし正の値なら翌月のその日になります。正味日数の場合には0を設定して下さい（それ以外は月初日を基準とします）。" "1を設定します。もし正の値なら翌月のその日になります。正味日数の場合には0を設定します（それ以外は月初日を基準とします）。"
#. module: account #. module: account
#: model:ir.ui.menu,name:account.menu_finance_legal_statement #: model:ir.ui.menu,name:account.menu_finance_legal_statement
@ -8067,7 +8065,7 @@ msgstr "仕入返金仕訳帳"
#. module: account #. module: account
#: help:account.tax.template,amount:0 #: help:account.tax.template,amount:0
msgid "For Tax Type percent enter % ratio between 0-1." msgid "For Tax Type percent enter % ratio between 0-1."
msgstr "税金はパーセンテージタイプのため、0から1の間の%比率を入力して下さい。" msgstr "税金はパーセンテージタイプのため、0から1の間の%比率を入力します。"
#. module: account #. module: account
#: view:account.analytic.account:0 #: view:account.analytic.account:0
@ -8673,7 +8671,7 @@ msgstr "通貨"
#: help:account.bank.statement.line,sequence:0 #: help:account.bank.statement.line,sequence:0
msgid "" msgid ""
"Gives the sequence order when displaying a list of bank statement lines." "Gives the sequence order when displaying a list of bank statement lines."
msgstr "銀行取引明細書のリストを表示する時には、並び順を与えて下さい。" msgstr "銀行取引明細書のリストを表示する時には並び順を与えます。"
#. module: account #. module: account
#: model:process.transition,note:account.process_transition_validentries0 #: model:process.transition,note:account.process_transition_validentries0
@ -8691,9 +8689,9 @@ msgid ""
"would be referred to as FY 2011. You are not obliged to follow the actual " "would be referred to as FY 2011. You are not obliged to follow the actual "
"calendar year." "calendar year."
msgstr "" msgstr ""
"ニーズに応じて会社の会計年度を定義して下さい。会計年度は会社のアカウントを構成する（通常12ヶ月）終わりまでの期間です。会計年度は通常その終わりの日付まで" "ニーズに応じて会社の会計年度を定義します。会計年度は会社のアカウントを構成する（通常12ヶ月）終わりまでの期間です。会計年度は通常その終わりの日付までが当"
"が当てはまります。例えば、会社の会計年度の終わりが2011年11月30日である場合、2010年12月1日から2011年11月30日の全てが2011年の会計" "てはまります。例えば、会社の会計年度の終わりが2011年11月30日である場合、2010年12月1日から2011年11月30日の全てが2011年の会計年度"
"年度に当てはまります。実際の暦年に従う必要はありません。" "に当てはまります。実際の暦年に従う必要はありません。"
#. module: account #. module: account
#: view:account.entries.report:0 #: view:account.entries.report:0
@ -8798,7 +8796,7 @@ msgstr "期間原価元帳"
msgid "" msgid ""
"Set if the tax computation is based on the computation of child taxes rather " "Set if the tax computation is based on the computation of child taxes rather "
"than on the total amount." "than on the total amount."
msgstr "税金計算が合計金額よりむしろ子の税金の計算に基づく場合は設定して下さい。" msgstr "税金計算が合計金額より、むしろ、子の税金の計算に基づく場合は設定して下さい。"
#. module: account #. module: account
#: selection:account.tax,applicable_type:0 #: selection:account.tax,applicable_type:0
@ -9149,7 +9147,7 @@ msgid ""
"related to this account and the counter-part \"Account receivable\"." "related to this account and the counter-part \"Account receivable\"."
msgstr "" msgstr ""
"このビューはOpenERPに大量のエントリーを記録するために会計士によって使われます。顧客請求書を記録することを望む場合、検索ツールバーの仕訳帳と期間を選" "このビューはOpenERPに大量のエントリーを記録するために会計士によって使われます。顧客請求書を記録することを望む場合、検索ツールバーの仕訳帳と期間を選"
"択して下さい。それから、損益勘定のエントリー行を開始します。OpenERPはこのアカウントに関係する税金と相手方の売掛金を自動的に提案します。" "択します。それから、損益勘定のエントリー行を開始します。OpenERPはこのアカウントに関係する税金と相手方の売掛金を自動的に提案します。"
#. module: account #. module: account
#: code:addons/account/wizard/account_automatic_reconcile.py:152 #: code:addons/account/wizard/account_automatic_reconcile.py:152
@ -9173,7 +9171,7 @@ msgid ""
"period." "period."
msgstr "" msgstr ""
"会社の会計年度の時間間隔である会計期間をここで定義して下さい。会計期間は通常は１ヶ月あるいは３ヶ月です。これは、通常は税金申告の期間た対応します。ここから" "会社の会計年度の時間間隔である会計期間をここで定義して下さい。会計期間は通常は１ヶ月あるいは３ヶ月です。これは、通常は税金申告の期間た対応します。ここから"
"期間を作成して管理して下さい。そして、期間は閉じられるべきなのか、特定の期間にわたる会社の活動に応じて開いたままにしておくのかを決めます。" "期間を作成して管理します。そして、期間は閉じられるべきなのか、特定の期間にわたる会社の活動に応じて開いたままにしておくのかを決めます。"
#. module: account #. module: account
#: report:account.third_party_ledger:0 #: report:account.third_party_ledger:0
@ -9449,7 +9447,7 @@ msgid ""
msgstr "" msgstr ""
"期間は会計に関連する活動を記録すべき会計エントリーが含まれる会計期間のことです。月次期間が標準ですが、あなたの国あるいは会社のニーズに依存します。また、四" "期間は会計に関連する活動を記録すべき会計エントリーが含まれる会計期間のことです。月次期間が標準ですが、あなたの国あるいは会社のニーズに依存します。また、四"
"半期期間を持つこともできます。期間の閉鎖は新しい会計エントリーの記録を不可能にし、全ての新しいエントリーは次の開設期間でなされる必要があります。新しいエン" "半期期間を持つこともできます。期間の閉鎖は新しい会計エントリーの記録を不可能にし、全ての新しいエントリーは次の開設期間でなされる必要があります。新しいエン"
"トリーを記録したくない場合、あるいは税金に関連する計算のためにこの期間をロックしたい場合は期間を閉じてください。" "トリーを記録したくない場合、あるいは税金に関連する計算のためにこの期間をロックしたい場合は期間を閉じて下さい。"
#. module: account #. module: account
#: view:account.analytic.account:0 #: view:account.analytic.account:0
@ -10259,8 +10257,8 @@ msgid ""
"may keep several types of specialized journals such as a cash journal, " "may keep several types of specialized journals such as a cash journal, "
"purchase journal, sales journal..." "purchase journal, sales journal..."
msgstr "" msgstr ""
"このメニューから会社の仕訳帳を作成し管理して下さい。仕訳帳は複式簿記システムを使って、会社の日々のビジネスに関連した全ての会計データの取引を記録するために" "このメニューから会社の仕訳帳を作成し管理します。仕訳帳は複式簿記システムを使って、会社の日々のビジネスに関連した全ての会計データの取引を記録するために使用"
"使用されます。その活動の性質と日常の取引の数に応じて、会社は現金仕訳帳、仕入仕訳帳、売上仕訳帳といった専門的な仕訳帳の幾つかのタイプを持ちます。" "されます。その活動の性質と日常の取引の数に応じて、会社は現金仕訳帳、仕入仕訳帳、売上仕訳帳といった専門的な仕訳帳の幾つかのタイプを持ちます。"
#. module: account #. module: account
#: view:account.payment.term:0 #: view:account.payment.term:0
@ -10439,7 +10437,7 @@ msgstr ""
"${object.address_invoice_id.name and ' ' or " "${object.address_invoice_id.name and ' ' or "
"''}${object.address_invoice_id.name or ''}様,\n" "''}${object.address_invoice_id.name or ''}様,\n"
"\n" "\n"
"新しい請求書をお届けします。どうぞご確認ください。発行者： ${object.partner_id.name}:\n" "新しい請求書をお届けします。どうぞご確認下さい。発行者： ${object.partner_id.name}:\n"
" | 請求書番号： *${object.number}*\n" " | 請求書番号： *${object.number}*\n"
" | 請求金額合計： *${object.amount_total} ${object.currency_id.name}*\n" " | 請求金額合計： *${object.amount_total} ${object.currency_id.name}*\n"
" | 請求日： ${object.date_invoice}\n" " | 請求日： ${object.date_invoice}\n"
@ -10473,10 +10471,10 @@ msgstr ""
" ${paypal_url}\n" " ${paypal_url}\n"
"% endif\n" "% endif\n"
"\n" "\n"
"何かご質問等ございましたら、ご遠慮なく弊社までお問い合わせください。\n" "何かご質問等ございましたら、ご遠慮なく弊社までお問い合わせ下さい。\n"
"\n" "\n"
"\n" "\n"
"弊社をご利用いただきありがとうございました。 ${object.company_id.name}\n" "弊社をご利用いただき、ありがとうございました。 ${object.company_id.name}\n"
"\n" "\n"
"\n" "\n"
"--\n" "--\n"

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,35 +8,34 @@
<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)]"/>
</tree> </tree>
<form string="Tax Mapping"> <form string="Tax Mapping" version="7.0">
<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)]"/>
</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"/>
</tree> </tree>
<form string="Account Mapping"> <form string="Account Mapping" version="7.0">
<field name="account_src_id"/> <field name="account_src_id"/>
<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>
@ -77,55 +76,56 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<page string="History" position="before"> <page string="History" position="before">
<page string="Accounting"> <page string="Accounting">
<group col="2" colspan="2"> <group>
<separator string="Customer Accounting Properties" colspan="2"/> <group string="Customer Accounting Properties">
<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">
<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">
<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">
</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>

143
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>

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

58
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,8 +151,8 @@
<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">
<field name="name"/> <field name="name"/>
<field name="month"/> <field name="month"/>
</search> </search>
</field> </field>
</record> </record>
@ -163,7 +165,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>
@ -187,9 +189,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>
@ -206,14 +208,14 @@
</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">
<field name="name"/> <field name="name"/>
<field name="month"/> <field name="month"/>
</search> </search>
</field> </field>
</record> </record>

140
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">
<field name="has_default_company" invisible="1" /> <field name="has_default_company" invisible="1" />
<field name="has_chart_of_accounts" invisible="1"/> <field name="has_chart_of_accounts" invisible="1"/>
<field name="company_id" widget="selection" on_change="onchange_company_id(company_id)" <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"
attrs="{'invisible': [('has_default_company', '=', True)]}"/> attrs="{'invisible': [('has_default_company', '=', True)]}"/>
<field name="expects_chart_of_accounts"/> <field name="expects_chart_of_accounts"/>
</group>
<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"> <field name="complete_tax_set" invisible="1"/>
<separator string="Accounting Configuration" colspan="4"/> <group string="Accounting Configuration">
<field name ="complete_tax_set" invisible="1"/> <group>
<newline/> <field name="default_sale_tax" domain="[('type_tax_use','=','sale'), ('company_id','=',company_id)]" attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
<group colspan="2" col="2"> <field name="module_account_accountant"/>
<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_asset"/>
<field name="module_account_accountant"/>
<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>
<group colspan="2" col="2"> <group>
<separator string="Customer Invoices" colspan="2"/> <field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]" attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
<field name="sale_journal_id" invisible="1"/> <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="Invoice Sequence" for="sale_sequence_prefix"/> <label string="Invoice Sequence" for="sale_sequence_prefix"/>
<group colspan="1" col="2"> <div>
<field name="sale_sequence_prefix" nolabel="1"/> <field name="sale_sequence_prefix" class="oe_form_inline"/>
<field name="sale_sequence_next" nolabel="1" attrs="{'readonly': [('sale_journal_id','=',False)]}"/> <field name="sale_sequence_next" class="oe_form_inline" attrs="{'readonly': [('sale_journal_id','=',False)]}"/>
</group> </div>
<field name="sale_refund_journal_id" invisible="1"/>
<label string="Credit Note Sequence" for="sale_refund_sequence_prefix"/> <label string="Credit Note Sequence" for="sale_refund_sequence_prefix"/>
<group colspan="1" col="2"> <div>
<field name="sale_refund_sequence_prefix" nolabel="1"/> <field name="sale_refund_sequence_prefix" class="oe_form_inline"/>
<field name="sale_refund_sequence_next" nolabel="1" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/> <field name="sale_refund_sequence_next" class="oe_form_inline" attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
</group> </div>
<field name="module_account_invoice_layout"/> <field name="module_account_invoice_layout"/>
<field name="module_account_voucher"/> <field name="module_account_voucher"/>
<field name="module_account_followup"/> <field name="module_account_followup"/>
<field name="group_proforma_invoices"/> <field name="group_proforma_invoices"/>
</group> </group>
<group colspan="2" col="2"> <group string="Supplier Invoices">
<separator string="Supplier Invoices" colspan="2"/>
<field name="purchase_journal_id" invisible="1"/>
<label string="Supplier Invoice Sequence" for="purchase_sequence_prefix"/> <label string="Supplier Invoice Sequence" for="purchase_sequence_prefix"/>
<group colspan="1" col="2"> <div>
<field name="purchase_sequence_prefix" nolabel="1"/> <field name="purchase_sequence_prefix" class="oe_form_inline"/>
<field name="purchase_sequence_next" nolabel="1" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/> <field name="purchase_sequence_next" class="oe_form_inline" attrs="{'readonly': [('purchase_journal_id','=',False)]}"/>
</group> </div>
<field name="purchase_refund_journal_id" invisible="1"/>
<label string="Supplier Credit Note Sequence" for="purchase_refund_sequence_prefix"/> <label string="Supplier Credit Note Sequence" for="purchase_refund_sequence_prefix"/>
<group colspan="1" col="2"> <div>
<field name="purchase_refund_sequence_prefix" nolabel="1"/> <field name="purchase_refund_sequence_prefix" class="oe_form_inline"/>
<field name="purchase_refund_sequence_next" nolabel="1" attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/> <field name="purchase_refund_sequence_next" class="oe_form_inline"
</group> attrs="{'readonly': [('purchase_refund_journal_id','=',False)]}"/>
</div>
<field name="module_account_payment"/> <field name="module_account_payment"/>
</group> </group>
<group colspan="2" col="2"> <group string="Electronic Payments">
<separator string="Electronic Payments" colspan="2"/>
<field name="paypal_account"/> <field name="paypal_account"/>
</group> </group>
<group colspan="2" col="2"> <group string="Bank &amp; Cash">
<separator string="Bank &amp; Cash" colspan="2"/>
<label string="Configure Bank Accounts :"/> <label string="Configure Bank Accounts :"/>
<button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/> <button name="%(action_bank_tree)d" string="Configure Bank Accounts" icon="gtk-go-forward" type="action"/>
<field name="company_footer"/> <field name="company_footer"/>
<field name="module_account_check_writing"/> <field name="module_account_check_writing"/>
</group> </group>
<group name="analytic_accounting" colspan="4" invisible="1"> <group name="analytic_accounting" invisible="1" string="Analytic Accounting"/>
<separator string="Analytic Accounting" colspan="4"/> </group>
</group>
</sheet>
</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>

24
addons/account_analytic_default/account_analytic_default_view.xml
View File

@ -6,7 +6,7 @@
<field name="model">account.analytic.default</field> <field name="model">account.analytic.default</field>
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Analytic Defaults" colors="grey:date_stop and (date_stop &lt; datetime.date.today().strftime('%%Y-%%m-%%d'))" > <tree string="Analytic Defaults">
<field name="sequence"/> <field name="sequence"/>
<field name="analytic_id" required="0" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/> <field name="analytic_id" required="0" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
<field name="product_id"/> <field name="product_id"/>
@ -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>

12
addons/account_analytic_default/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-16 17:39+0000\n" "PO-Revision-Date: 2012-06-08 01:35+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-17 04:51+0000\n" "X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
"X-Generator: Launchpad (build 15099)\n" "X-Generator: Launchpad (build 15376)\n"
#. module: account_analytic_default #. module: account_analytic_default
#: help:account.analytic.default,partner_id:0 #: help:account.analytic.default,partner_id:0
@ -57,7 +57,7 @@ msgstr "この分析アカウントのデフォルト終了日"
#. module: account_analytic_default #. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_stock_picking #: model:ir.model,name:account_analytic_default.model_stock_picking
msgid "Picking List" msgid "Picking List"
msgstr "集荷リスト" msgstr "出庫票"
#. module: account_analytic_default #. module: account_analytic_default
#: view:account.analytic.default:0 #: view:account.analytic.default:0
@ -128,7 +128,7 @@ msgstr "分析デフォルト"
#. module: account_analytic_default #. module: account_analytic_default
#: sql_constraint:stock.picking:0 #: sql_constraint:stock.picking:0
msgid "Reference must be unique per Company!" msgid "Reference must be unique per Company!"
msgstr "参照は会社ごとにユニークでなければいけません。" msgstr "参照は会社内で固有でなければいけません"
#. module: account_analytic_default #. module: account_analytic_default
#: view:account.analytic.default:0 #: view:account.analytic.default:0
@ -181,7 +181,7 @@ msgstr "開始日"
#: help:account.analytic.default,sequence:0 #: help:account.analytic.default,sequence:0
msgid "" msgid ""
"Gives the sequence order when displaying a list of analytic distribution" "Gives the sequence order when displaying a list of analytic distribution"
msgstr "分析ディストリビューションのリストを表示する時に、順序の並べ順を与えて下さい。" msgstr "分析ディストリビューションのリストを表示する時に、順序の並びを与えます。"
#. module: account_analytic_default #. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_sale_order_line #: model:ir.model,name:account_analytic_default.model_sale_order_line

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>

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

@ -8,19 +8,19 @@ 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-05-31 06:16+0000\n" "PO-Revision-Date: 2012-06-10 03:21+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-01 05:33+0000\n" "X-Launchpad-Export-Date: 2012-06-11 04:46+0000\n"
"X-Generator: Launchpad (build 15342)\n" "X-Generator: Launchpad (build 15376)\n"
#. module: account_anglo_saxon #. module: account_anglo_saxon
#: sql_constraint:purchase.order:0 #: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!" msgid "Order Reference must be unique per Company!"
msgstr "注文参照は、会社内で固有でなければなりません。" msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
#. module: account_anglo_saxon #. module: account_anglo_saxon
#: view:product.category:0 #: view:product.category:0

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>

793
addons/account_asset/i18n/et.po Normal file
View File

@ -0,0 +1,793 @@
# Estonian translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-06-08 18:43+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Estonian <et@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
"X-Generator: Launchpad (build 15376)\n"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Assets in draft and open states"
msgstr ""
#. module: account_asset
#: field:account.asset.category,method_end:0
#: field:account.asset.history,method_end:0 field:asset.modify,method_end:0
msgid "Ending date"
msgstr "Lõppkuupäev"
#. module: account_asset
#: field:account.asset.asset,value_residual:0
msgid "Residual Value"
msgstr "Jääkväärtus"
#. module: account_asset
#: field:account.asset.category,account_expense_depreciation_id:0
msgid "Depr. Expense Account"
msgstr ""
#. module: account_asset
#: view:asset.depreciation.confirmation.wizard:0
msgid "Compute Asset"
msgstr "Arvestus"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Group By..."
msgstr "Grupeeri..."
#. module: account_asset
#: field:asset.asset.report,gross_value:0
msgid "Gross Amount"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0 field:account.asset.asset,name:0
#: field:account.asset.depreciation.line,asset_id:0
#: field:account.asset.history,asset_id:0 field:account.move.line,asset_id:0
#: view:asset.asset.report:0 field:asset.asset.report,asset_id:0
#: model:ir.model,name:account_asset.model_account_asset_asset
msgid "Asset"
msgstr ""
#. module: account_asset
#: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0
msgid ""
"Indicates that the first depreciation entry for this asset have to be done "
"from the purchase date instead of the first January"
msgstr ""
#. module: account_asset
#: field:account.asset.history,name:0
msgid "History name"
msgstr ""
#. module: account_asset
#: field:account.asset.asset,company_id:0
#: field:account.asset.category,company_id:0 view:asset.asset.report:0
#: field:asset.asset.report,company_id:0
msgid "Company"
msgstr "Ettevõte"
#. module: account_asset
#: view:asset.modify:0
msgid "Modify"
msgstr "Muuda"
#. module: account_asset
#: selection:account.asset.asset,state:0 view:asset.asset.report:0
#: selection:asset.asset.report,state:0
msgid "Running"
msgstr "Käivitatud"
#. module: account_asset
#: field:account.asset.depreciation.line,amount:0
msgid "Depreciation Amount"
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0
#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
#: model:ir.model,name:account_asset.model_asset_asset_report
#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
msgid "Assets Analysis"
msgstr "Põhivarade analüüs"
#. module: account_asset
#: field:asset.modify,name:0
msgid "Reason"
msgstr "Põhjus"
#. module: account_asset
#: field:account.asset.asset,method_progress_factor:0
#: field:account.asset.category,method_progress_factor:0
msgid "Degressive Factor"
msgstr ""
#. module: account_asset
#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
msgid "Asset Categories"
msgstr ""
#. module: account_asset
#: view:asset.depreciation.confirmation.wizard:0
msgid ""
"This wizard will post the depreciation lines of running assets that belong "
"to the selected period."
msgstr ""
#. module: account_asset
#: field:account.asset.asset,account_move_line_ids:0
#: field:account.move.line,entry_ids:0
#: model:ir.actions.act_window,name:account_asset.act_entries_open
msgid "Entries"
msgstr "Kirjed"
#. module: account_asset
#: view:account.asset.asset:0
#: field:account.asset.asset,depreciation_line_ids:0
msgid "Depreciation Lines"
msgstr ""
#. module: account_asset
#: help:account.asset.asset,salvage_value:0
msgid "It is the amount you plan to have that you cannot depreciate."
msgstr ""
#. module: account_asset
#: field:account.asset.depreciation.line,depreciation_date:0
#: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0
msgid "Depreciation Date"
msgstr ""
#. module: account_asset
#: field:account.asset.category,account_asset_id:0
msgid "Asset Account"
msgstr ""
#. module: account_asset
#: field:asset.asset.report,posted_value:0
msgid "Posted Amount"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0 view:asset.asset.report:0
#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
#: model:ir.ui.menu,name:account_asset.menu_finance_assets
#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
msgid "Assets"
msgstr "Varad"
#. module: account_asset
#: field:account.asset.category,account_depreciation_id:0
msgid "Depreciation Account"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0 view:account.asset.category:0
#: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0
msgid "Notes"
msgstr "Märkused"
#. module: account_asset
#: field:account.asset.depreciation.line,move_id:0
msgid "Depreciation Entry"
msgstr ""
#. module: account_asset
#: sql_constraint:account.move.line:0
msgid "Wrong credit or debit value in accounting entry !"
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0 field:asset.asset.report,nbr:0
msgid "# of Depreciation Lines"
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0
msgid "Assets in draft state"
msgstr ""
#. module: account_asset
#: field:account.asset.asset,method_end:0
#: selection:account.asset.asset,method_time:0
#: selection:account.asset.category,method_time:0
#: selection:account.asset.history,method_time:0
msgid "Ending Date"
msgstr "Lõppkuupäev"
#. module: account_asset
#: field:account.asset.asset,code:0
msgid "Reference"
msgstr "Viide"
#. module: account_asset
#: constraint:account.invoice:0
msgid "Invalid BBA Structured Communication !"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0
msgid "Account Asset"
msgstr ""
#. module: account_asset
#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
msgid "Compute Assets"
msgstr ""
#. module: account_asset
#: field:account.asset.depreciation.line,sequence:0
msgid "Sequence of the depreciation"
msgstr ""
#. module: account_asset
#: field:account.asset.asset,method_period:0
#: field:account.asset.category,method_period:0
#: field:account.asset.history,method_period:0
#: field:asset.modify,method_period:0
msgid "Period Length"
msgstr ""
#. module: account_asset
#: selection:account.asset.asset,state:0 view:asset.asset.report:0
#: selection:asset.asset.report,state:0
msgid "Draft"
msgstr "Mustand"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Date of asset purchase"
msgstr "Soetuskuupäev"
#. module: account_asset
#: help:account.asset.asset,method_number:0
msgid "Calculates Depreciation within specified interval"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0
msgid "Change Duration"
msgstr ""
#. module: account_asset
#: field:account.asset.category,account_analytic_id:0
msgid "Analytic account"
msgstr "Analüütiline konto"
#. module: account_asset
#: field:account.asset.asset,method:0 field:account.asset.category,method:0
msgid "Computation Method"
msgstr "Arvestusmeetod"
#. module: account_asset
#: help:account.asset.asset,method_period:0
msgid "State here the time during 2 depreciations, in months"
msgstr ""
#. module: account_asset
#: constraint:account.asset.asset:0
msgid ""
"Prorata temporis can be applied only for time method \"number of "
"depreciations\"."
msgstr ""
#. module: account_asset
#: help:account.asset.history,method_time:0
msgid ""
"The method to use to compute the dates and number of depreciation lines.\n"
"Number of Depreciations: Fix the number of depreciation lines and the time "
"between 2 depreciations.\n"
"Ending Date: Choose the time between 2 depreciations and the date the "
"depreciations won't go beyond."
msgstr ""
#. module: account_asset
#: field:account.asset.asset,purchase_value:0
msgid "Gross value "
msgstr ""
#. module: account_asset
#: constraint:account.asset.asset:0
msgid "Error ! You can not create recursive assets."
msgstr ""
#. module: account_asset
#: help:account.asset.history,method_period:0
msgid "Time in month between two depreciations"
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0 field:asset.asset.report,name:0
msgid "Year"
msgstr "Aasta"
#. module: account_asset
#: view:asset.modify:0
#: model:ir.actions.act_window,name:account_asset.action_asset_modify
#: model:ir.model,name:account_asset.model_asset_modify
msgid "Modify Asset"
msgstr "Muuda"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Other Information"
msgstr "Muu info"
#. module: account_asset
#: field:account.asset.asset,salvage_value:0
msgid "Salvage Value"
msgstr ""
#. module: account_asset
#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
msgid "Asset Category"
msgstr "Kategooria"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Set to Close"
msgstr "Sulge"
#. module: account_asset
#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
msgid "Compute assets"
msgstr "Arvesta"
#. module: account_asset
#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
msgid "Modify asset"
msgstr "Muuda"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Assets in closed state"
msgstr "Suletud põhivarad"
#. module: account_asset
#: field:account.asset.asset,parent_id:0
msgid "Parent Asset"
msgstr ""
#. module: account_asset
#: view:account.asset.history:0
#: model:ir.model,name:account_asset.model_account_asset_history
msgid "Asset history"
msgstr "Põhivara ajalugu"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Assets purchased in current year"
msgstr ""
#. module: account_asset
#: field:account.asset.asset,state:0 field:asset.asset.report,state:0
msgid "State"
msgstr "Olek"
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_invoice_line
msgid "Invoice Line"
msgstr "Arve rida"
#. module: account_asset
#: constraint:account.move.line:0
msgid ""
"The selected account of your Journal Entry forces to provide a secondary "
"currency. You should remove the secondary currency on the account or select "
"a multi-currency view on the journal."
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0
msgid "Month"
msgstr "Kuu"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Depreciation Board"
msgstr ""
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_move_line
msgid "Journal Items"
msgstr ""
#. module: account_asset
#: field:asset.asset.report,unposted_value:0
msgid "Unposted Amount"
msgstr ""
#. module: account_asset
#: field:account.asset.asset,method_time:0
#: field:account.asset.category,method_time:0
#: field:account.asset.history,method_time:0
msgid "Time Method"
msgstr ""
#. module: account_asset
#: view:account.asset.category:0
msgid "Analytic Information"
msgstr ""
#. module: account_asset
#: view:asset.modify:0
msgid "Asset Durations to Modify"
msgstr ""
#. module: account_asset
#: constraint:account.move.line:0
msgid ""
"The date of your Journal Entry is not in the defined period! You should "
"change the date or remove this constraint from the journal."
msgstr ""
#. module: account_asset
#: field:account.asset.asset,note:0 field:account.asset.category,note:0
#: field:account.asset.history,note:0
msgid "Note"
msgstr "Märkus"
#. module: account_asset
#: help:account.asset.asset,method:0 help:account.asset.category,method:0
msgid ""
"Choose the method to use to compute the amount of depreciation lines.\n"
" * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
" * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
msgstr ""
#. module: account_asset
#: help:account.asset.asset,method_time:0
#: help:account.asset.category,method_time:0
msgid ""
"Choose the method to use to compute the dates and number of depreciation "
"lines.\n"
" * Number of Depreciations: Fix the number of depreciation lines and the "
"time between 2 depreciations.\n"
" * Ending Date: Choose the time between 2 depreciations and the date the "
"depreciations won't go beyond."
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0
msgid "Assets in running state"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0
msgid "Closed"
msgstr "Suletud"
#. module: account_asset
#: field:account.asset.asset,partner_id:0
#: field:asset.asset.report,partner_id:0
msgid "Partner"
msgstr "Partner"
#. module: account_asset
#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
msgid "Amount of Depreciation Lines"
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0
msgid "Posted depreciation lines"
msgstr ""
#. module: account_asset
#: constraint:account.move.line:0
msgid "Company must be the same for its related account and period."
msgstr ""
#. module: account_asset
#: field:account.asset.asset,child_ids:0
msgid "Children Assets"
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0
msgid "Date of depreciation"
msgstr ""
#. module: account_asset
#: field:account.asset.history,user_id:0
msgid "User"
msgstr "Kasutaja"
#. module: account_asset
#: field:account.asset.history,date:0
msgid "Date"
msgstr "Kuupäev"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Assets purchased in current month"
msgstr ""
#. module: account_asset
#: constraint:account.move.line:0
msgid "You can not create journal items on an account of type view."
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0
msgid "Extended Filters..."
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
msgid "Compute"
msgstr "Arvuta"
#. module: account_asset
#: view:account.asset.category:0
msgid "Search Asset Category"
msgstr ""
#. module: account_asset
#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
msgid "asset.depreciation.confirmation.wizard"
msgstr ""
#. module: account_asset
#: field:account.asset.asset,active:0
msgid "Active"
msgstr "Aktiivne"
#. module: account_asset
#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
msgid "Close asset"
msgstr "Sulge"
#. module: account_asset
#: field:account.asset.depreciation.line,parent_state:0
msgid "State of Asset"
msgstr "Olek"
#. module: account_asset
#: field:account.asset.depreciation.line,name:0
msgid "Depreciation Name"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
msgid "History"
msgstr "Ajalugu"
#. module: account_asset
#: sql_constraint:account.invoice:0
msgid "Invoice Number must be unique per Company!"
msgstr ""
#. module: account_asset
#: field:asset.depreciation.confirmation.wizard,period_id:0
msgid "Period"
msgstr "Periood"
#. module: account_asset
#: view:account.asset.asset:0
msgid "General"
msgstr "Üldine"
#. module: account_asset
#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
msgid "Prorata Temporis"
msgstr ""
#. module: account_asset
#: view:account.asset.category:0
msgid "Accounting Information"
msgstr ""
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_invoice
msgid "Invoice"
msgstr "Arve"
#. module: account_asset
#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
msgid "Review Asset Categories"
msgstr ""
#. module: account_asset
#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
msgid "Cancel"
msgstr "Loobu"
#. module: account_asset
#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
msgid "Close"
msgstr "Sulge"
#. module: account_asset
#: view:account.asset.asset:0 view:account.asset.category:0
msgid "Depreciation Method"
msgstr "Amortisatsioonimeetod"
#. module: account_asset
#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
#: field:asset.asset.report,purchase_date:0
msgid "Purchase Date"
msgstr "Ostetud"
#. module: account_asset
#: selection:account.asset.asset,method:0
#: selection:account.asset.category,method:0
msgid "Degressive"
msgstr ""
#. module: account_asset
#: help:asset.depreciation.confirmation.wizard,period_id:0
msgid ""
"Choose the period for which you want to automatically post the depreciation "
"lines of running assets"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0
msgid "Current"
msgstr "Praegune"
#. module: account_asset
#: field:account.asset.depreciation.line,remaining_value:0
msgid "Amount to Depreciate"
msgstr ""
#. module: account_asset
#: field:account.asset.category,open_asset:0
msgid "Skip Draft State"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0 view:account.asset.category:0
#: view:account.asset.history:0
msgid "Depreciation Dates"
msgstr ""
#. module: account_asset
#: field:account.asset.asset,currency_id:0
msgid "Currency"
msgstr "Valuuta"
#. module: account_asset
#: field:account.asset.category,journal_id:0
msgid "Journal"
msgstr "Päevik"
#. module: account_asset
#: field:account.asset.depreciation.line,depreciated_value:0
msgid "Amount Already Depreciated"
msgstr ""
#. module: account_asset
#: field:account.asset.depreciation.line,move_check:0
#: view:asset.asset.report:0 field:asset.asset.report,move_check:0
msgid "Posted"
msgstr "Postitatud"
#. module: account_asset
#: help:account.asset.asset,state:0
msgid ""
"When an asset is created, the state is 'Draft'.\n"
"If the asset is confirmed, the state goes in 'Running' and the depreciation "
"lines can be posted in the accounting.\n"
"You can manually close an asset when the depreciation is over. If the last "
"line of depreciation is posted, the asset automatically goes in that state."
msgstr ""
#. module: account_asset
#: field:account.asset.category,name:0
msgid "Name"
msgstr "Nimi"
#. module: account_asset
#: help:account.asset.category,open_asset:0
msgid ""
"Check this if you want to automatically confirm the assets of this category "
"when created by invoices."
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0
msgid "Set to Draft"
msgstr "Sea mustandiks"
#. module: account_asset
#: selection:account.asset.asset,method:0
#: selection:account.asset.category,method:0
msgid "Linear"
msgstr "Lineaarne"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Month-1"
msgstr ""
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
msgid "Asset depreciation line"
msgstr ""
#. module: account_asset
#: field:account.asset.asset,category_id:0 view:account.asset.category:0
#: field:asset.asset.report,asset_category_id:0
#: model:ir.model,name:account_asset.model_account_asset_category
msgid "Asset category"
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0
msgid "Assets purchased in last month"
msgstr ""
#. module: account_asset
#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
#, python-format
msgid "Created Asset Moves"
msgstr ""
#. module: account_asset
#: constraint:account.move.line:0
msgid "You can not create journal items on closed account."
msgstr ""
#. module: account_asset
#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
msgid ""
"From this report, you can have an overview on all depreciation. The tool "
"search can also be used to personalise your Assets reports and so, match "
"this analysis to your needs;"
msgstr ""
#. module: account_asset
#: help:account.asset.category,method_period:0
msgid "State here the time between 2 depreciations, in months"
msgstr ""
#. module: account_asset
#: field:account.asset.asset,method_number:0
#: selection:account.asset.asset,method_time:0
#: field:account.asset.category,method_number:0
#: selection:account.asset.category,method_time:0
#: field:account.asset.history,method_number:0
#: selection:account.asset.history,method_time:0
#: field:asset.modify,method_number:0
msgid "Number of Depreciations"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0
msgid "Create Move"
msgstr ""
#. module: account_asset
#: view:asset.depreciation.confirmation.wizard:0
msgid "Post Depreciation Lines"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0
msgid "Confirm Asset"
msgstr ""
#. module: account_asset
#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
msgid "Asset Hierarchy"
msgstr ""

793
addons/account_asset/i18n/sl.po Normal file
View File

@ -0,0 +1,793 @@
# Slovenian translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-06-09 10:25+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Slovenian <sl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-10 04:37+0000\n"
"X-Generator: Launchpad (build 15376)\n"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Assets in draft and open states"
msgstr ""
#. module: account_asset
#: field:account.asset.category,method_end:0
#: field:account.asset.history,method_end:0 field:asset.modify,method_end:0
msgid "Ending date"
msgstr "Datum zaključka"
#. module: account_asset
#: field:account.asset.asset,value_residual:0
msgid "Residual Value"
msgstr ""
#. module: account_asset
#: field:account.asset.category,account_expense_depreciation_id:0
msgid "Depr. Expense Account"
msgstr ""
#. module: account_asset
#: view:asset.depreciation.confirmation.wizard:0
msgid "Compute Asset"
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0
msgid "Group By..."
msgstr "Združeno po..."
#. module: account_asset
#: field:asset.asset.report,gross_value:0
msgid "Gross Amount"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0 field:account.asset.asset,name:0
#: field:account.asset.depreciation.line,asset_id:0
#: field:account.asset.history,asset_id:0 field:account.move.line,asset_id:0
#: view:asset.asset.report:0 field:asset.asset.report,asset_id:0
#: model:ir.model,name:account_asset.model_account_asset_asset
msgid "Asset"
msgstr "Premoženje"
#. module: account_asset
#: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0
msgid ""
"Indicates that the first depreciation entry for this asset have to be done "
"from the purchase date instead of the first January"
msgstr ""
#. module: account_asset
#: field:account.asset.history,name:0
msgid "History name"
msgstr "Naziv"
#. module: account_asset
#: field:account.asset.asset,company_id:0
#: field:account.asset.category,company_id:0 view:asset.asset.report:0
#: field:asset.asset.report,company_id:0
msgid "Company"
msgstr "Podjetje"
#. module: account_asset
#: view:asset.modify:0
msgid "Modify"
msgstr "Spremeni"
#. module: account_asset
#: selection:account.asset.asset,state:0 view:asset.asset.report:0
#: selection:asset.asset.report,state:0
msgid "Running"
msgstr "Se izvaja"
#. module: account_asset
#: field:account.asset.depreciation.line,amount:0
msgid "Depreciation Amount"
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0
#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
#: model:ir.model,name:account_asset.model_asset_asset_report
#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
msgid "Assets Analysis"
msgstr ""
#. module: account_asset
#: field:asset.modify,name:0
msgid "Reason"
msgstr "Vzrok"
#. module: account_asset
#: field:account.asset.asset,method_progress_factor:0
#: field:account.asset.category,method_progress_factor:0
msgid "Degressive Factor"
msgstr ""
#. module: account_asset
#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
msgid "Asset Categories"
msgstr ""
#. module: account_asset
#: view:asset.depreciation.confirmation.wizard:0
msgid ""
"This wizard will post the depreciation lines of running assets that belong "
"to the selected period."
msgstr ""
#. module: account_asset
#: field:account.asset.asset,account_move_line_ids:0
#: field:account.move.line,entry_ids:0
#: model:ir.actions.act_window,name:account_asset.act_entries_open
msgid "Entries"
msgstr "Vnosi"
#. module: account_asset
#: view:account.asset.asset:0
#: field:account.asset.asset,depreciation_line_ids:0
msgid "Depreciation Lines"
msgstr ""
#. module: account_asset
#: help:account.asset.asset,salvage_value:0
msgid "It is the amount you plan to have that you cannot depreciate."
msgstr ""
#. module: account_asset
#: field:account.asset.depreciation.line,depreciation_date:0
#: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0
msgid "Depreciation Date"
msgstr ""
#. module: account_asset
#: field:account.asset.category,account_asset_id:0
msgid "Asset Account"
msgstr ""
#. module: account_asset
#: field:asset.asset.report,posted_value:0
msgid "Posted Amount"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0 view:asset.asset.report:0
#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
#: model:ir.ui.menu,name:account_asset.menu_finance_assets
#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
msgid "Assets"
msgstr "Premoženje"
#. module: account_asset
#: field:account.asset.category,account_depreciation_id:0
msgid "Depreciation Account"
msgstr "Konto amortizacije"
#. module: account_asset
#: view:account.asset.asset:0 view:account.asset.category:0
#: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0
msgid "Notes"
msgstr "Opombe"
#. module: account_asset
#: field:account.asset.depreciation.line,move_id:0
msgid "Depreciation Entry"
msgstr ""
#. module: account_asset
#: sql_constraint:account.move.line:0
msgid "Wrong credit or debit value in accounting entry !"
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0 field:asset.asset.report,nbr:0
msgid "# of Depreciation Lines"
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0
msgid "Assets in draft state"
msgstr ""
#. module: account_asset
#: field:account.asset.asset,method_end:0
#: selection:account.asset.asset,method_time:0
#: selection:account.asset.category,method_time:0
#: selection:account.asset.history,method_time:0
msgid "Ending Date"
msgstr "Končni datum"
#. module: account_asset
#: field:account.asset.asset,code:0
msgid "Reference"
msgstr "Referenca"
#. module: account_asset
#: constraint:account.invoice:0
msgid "Invalid BBA Structured Communication !"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0
msgid "Account Asset"
msgstr ""
#. module: account_asset
#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
msgid "Compute Assets"
msgstr ""
#. module: account_asset
#: field:account.asset.depreciation.line,sequence:0
msgid "Sequence of the depreciation"
msgstr ""
#. module: account_asset
#: field:account.asset.asset,method_period:0
#: field:account.asset.category,method_period:0
#: field:account.asset.history,method_period:0
#: field:asset.modify,method_period:0
msgid "Period Length"
msgstr ""
#. module: account_asset
#: selection:account.asset.asset,state:0 view:asset.asset.report:0
#: selection:asset.asset.report,state:0
msgid "Draft"
msgstr "Osnutek"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Date of asset purchase"
msgstr ""
#. module: account_asset
#: help:account.asset.asset,method_number:0
msgid "Calculates Depreciation within specified interval"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0
msgid "Change Duration"
msgstr ""
#. module: account_asset
#: field:account.asset.category,account_analytic_id:0
msgid "Analytic account"
msgstr "Analitični konto"
#. module: account_asset
#: field:account.asset.asset,method:0 field:account.asset.category,method:0
msgid "Computation Method"
msgstr ""
#. module: account_asset
#: help:account.asset.asset,method_period:0
msgid "State here the time during 2 depreciations, in months"
msgstr ""
#. module: account_asset
#: constraint:account.asset.asset:0
msgid ""
"Prorata temporis can be applied only for time method \"number of "
"depreciations\"."
msgstr ""
#. module: account_asset
#: help:account.asset.history,method_time:0
msgid ""
"The method to use to compute the dates and number of depreciation lines.\n"
"Number of Depreciations: Fix the number of depreciation lines and the time "
"between 2 depreciations.\n"
"Ending Date: Choose the time between 2 depreciations and the date the "
"depreciations won't go beyond."
msgstr ""
#. module: account_asset
#: field:account.asset.asset,purchase_value:0
msgid "Gross value "
msgstr "Bruto "
#. module: account_asset
#: constraint:account.asset.asset:0
msgid "Error ! You can not create recursive assets."
msgstr ""
#. module: account_asset
#: help:account.asset.history,method_period:0
msgid "Time in month between two depreciations"
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0 field:asset.asset.report,name:0
msgid "Year"
msgstr "Leto"
#. module: account_asset
#: view:asset.modify:0
#: model:ir.actions.act_window,name:account_asset.action_asset_modify
#: model:ir.model,name:account_asset.model_asset_modify
msgid "Modify Asset"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0
msgid "Other Information"
msgstr ""
#. module: account_asset
#: field:account.asset.asset,salvage_value:0
msgid "Salvage Value"
msgstr ""
#. module: account_asset
#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
msgid "Asset Category"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0
msgid "Set to Close"
msgstr ""
#. module: account_asset
#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
msgid "Compute assets"
msgstr ""
#. module: account_asset
#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
msgid "Modify asset"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0
msgid "Assets in closed state"
msgstr ""
#. module: account_asset
#: field:account.asset.asset,parent_id:0
msgid "Parent Asset"
msgstr ""
#. module: account_asset
#: view:account.asset.history:0
#: model:ir.model,name:account_asset.model_account_asset_history
msgid "Asset history"
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0
msgid "Assets purchased in current year"
msgstr ""
#. module: account_asset
#: field:account.asset.asset,state:0 field:asset.asset.report,state:0
msgid "State"
msgstr "Status"
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_invoice_line
msgid "Invoice Line"
msgstr "Postavka računa"
#. module: account_asset
#: constraint:account.move.line:0
msgid ""
"The selected account of your Journal Entry forces to provide a secondary "
"currency. You should remove the secondary currency on the account or select "
"a multi-currency view on the journal."
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0
msgid "Month"
msgstr "Mesec"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Depreciation Board"
msgstr ""
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_move_line
msgid "Journal Items"
msgstr "Postavke"
#. module: account_asset
#: field:asset.asset.report,unposted_value:0
msgid "Unposted Amount"
msgstr ""
#. module: account_asset
#: field:account.asset.asset,method_time:0
#: field:account.asset.category,method_time:0
#: field:account.asset.history,method_time:0
msgid "Time Method"
msgstr ""
#. module: account_asset
#: view:account.asset.category:0
msgid "Analytic Information"
msgstr ""
#. module: account_asset
#: view:asset.modify:0
msgid "Asset Durations to Modify"
msgstr ""
#. module: account_asset
#: constraint:account.move.line:0
msgid ""
"The date of your Journal Entry is not in the defined period! You should "
"change the date or remove this constraint from the journal."
msgstr ""
#. module: account_asset
#: field:account.asset.asset,note:0 field:account.asset.category,note:0
#: field:account.asset.history,note:0
msgid "Note"
msgstr "Opomba"
#. module: account_asset
#: help:account.asset.asset,method:0 help:account.asset.category,method:0
msgid ""
"Choose the method to use to compute the amount of depreciation lines.\n"
" * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
" * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
msgstr ""
#. module: account_asset
#: help:account.asset.asset,method_time:0
#: help:account.asset.category,method_time:0
msgid ""
"Choose the method to use to compute the dates and number of depreciation "
"lines.\n"
" * Number of Depreciations: Fix the number of depreciation lines and the "
"time between 2 depreciations.\n"
" * Ending Date: Choose the time between 2 depreciations and the date the "
"depreciations won't go beyond."
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0
msgid "Assets in running state"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0
msgid "Closed"
msgstr "Zaprto"
#. module: account_asset
#: field:account.asset.asset,partner_id:0
#: field:asset.asset.report,partner_id:0
msgid "Partner"
msgstr "Poslovni partner"
#. module: account_asset
#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
msgid "Amount of Depreciation Lines"
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0
msgid "Posted depreciation lines"
msgstr ""
#. module: account_asset
#: constraint:account.move.line:0
msgid "Company must be the same for its related account and period."
msgstr ""
#. module: account_asset
#: field:account.asset.asset,child_ids:0
msgid "Children Assets"
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0
msgid "Date of depreciation"
msgstr ""
#. module: account_asset
#: field:account.asset.history,user_id:0
msgid "User"
msgstr "Uporabnik"
#. module: account_asset
#: field:account.asset.history,date:0
msgid "Date"
msgstr "Datum"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Assets purchased in current month"
msgstr ""
#. module: account_asset
#: constraint:account.move.line:0
msgid "You can not create journal items on an account of type view."
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0
msgid "Extended Filters..."
msgstr "Razširjeni filtri..."
#. module: account_asset
#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
msgid "Compute"
msgstr "Izračunaj"
#. module: account_asset
#: view:account.asset.category:0
msgid "Search Asset Category"
msgstr ""
#. module: account_asset
#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
msgid "asset.depreciation.confirmation.wizard"
msgstr ""
#. module: account_asset
#: field:account.asset.asset,active:0
msgid "Active"
msgstr "Aktivno"
#. module: account_asset
#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
msgid "Close asset"
msgstr ""
#. module: account_asset
#: field:account.asset.depreciation.line,parent_state:0
msgid "State of Asset"
msgstr ""
#. module: account_asset
#: field:account.asset.depreciation.line,name:0
msgid "Depreciation Name"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
msgid "History"
msgstr "Zgodovina"
#. module: account_asset
#: sql_constraint:account.invoice:0
msgid "Invoice Number must be unique per Company!"
msgstr "Številka računa se ne sme ponoviti!"
#. module: account_asset
#: field:asset.depreciation.confirmation.wizard,period_id:0
msgid "Period"
msgstr "Obdobje"
#. module: account_asset
#: view:account.asset.asset:0
msgid "General"
msgstr "Splošno"
#. module: account_asset
#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
msgid "Prorata Temporis"
msgstr ""
#. module: account_asset
#: view:account.asset.category:0
msgid "Accounting Information"
msgstr ""
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_invoice
msgid "Invoice"
msgstr "Račun"
#. module: account_asset
#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
msgid "Review Asset Categories"
msgstr ""
#. module: account_asset
#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
msgid "Cancel"
msgstr "Preklic"
#. module: account_asset
#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
msgid "Close"
msgstr "Zapri"
#. module: account_asset
#: view:account.asset.asset:0 view:account.asset.category:0
msgid "Depreciation Method"
msgstr ""
#. module: account_asset
#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
#: field:asset.asset.report,purchase_date:0
msgid "Purchase Date"
msgstr "Datum nakupa"
#. module: account_asset
#: selection:account.asset.asset,method:0
#: selection:account.asset.category,method:0
msgid "Degressive"
msgstr ""
#. module: account_asset
#: help:asset.depreciation.confirmation.wizard,period_id:0
msgid ""
"Choose the period for which you want to automatically post the depreciation "
"lines of running assets"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0
msgid "Current"
msgstr "Trenutno"
#. module: account_asset
#: field:account.asset.depreciation.line,remaining_value:0
msgid "Amount to Depreciate"
msgstr ""
#. module: account_asset
#: field:account.asset.category,open_asset:0
msgid "Skip Draft State"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0 view:account.asset.category:0
#: view:account.asset.history:0
msgid "Depreciation Dates"
msgstr ""
#. module: account_asset
#: field:account.asset.asset,currency_id:0
msgid "Currency"
msgstr "Valuta"
#. module: account_asset
#: field:account.asset.category,journal_id:0
msgid "Journal"
msgstr "Dnevnik"
#. module: account_asset
#: field:account.asset.depreciation.line,depreciated_value:0
msgid "Amount Already Depreciated"
msgstr ""
#. module: account_asset
#: field:account.asset.depreciation.line,move_check:0
#: view:asset.asset.report:0 field:asset.asset.report,move_check:0
msgid "Posted"
msgstr "Knjiženo"
#. module: account_asset
#: help:account.asset.asset,state:0
msgid ""
"When an asset is created, the state is 'Draft'.\n"
"If the asset is confirmed, the state goes in 'Running' and the depreciation "
"lines can be posted in the accounting.\n"
"You can manually close an asset when the depreciation is over. If the last "
"line of depreciation is posted, the asset automatically goes in that state."
msgstr ""
#. module: account_asset
#: field:account.asset.category,name:0
msgid "Name"
msgstr "Naziv"
#. module: account_asset
#: help:account.asset.category,open_asset:0
msgid ""
"Check this if you want to automatically confirm the assets of this category "
"when created by invoices."
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0
msgid "Set to Draft"
msgstr "Nastavi kot osnutek"
#. module: account_asset
#: selection:account.asset.asset,method:0
#: selection:account.asset.category,method:0
msgid "Linear"
msgstr "Linearno"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Month-1"
msgstr "Mesec-1"
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
msgid "Asset depreciation line"
msgstr ""
#. module: account_asset
#: field:account.asset.asset,category_id:0 view:account.asset.category:0
#: field:asset.asset.report,asset_category_id:0
#: model:ir.model,name:account_asset.model_account_asset_category
msgid "Asset category"
msgstr ""
#. module: account_asset
#: view:asset.asset.report:0
msgid "Assets purchased in last month"
msgstr ""
#. module: account_asset
#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
#, python-format
msgid "Created Asset Moves"
msgstr ""
#. module: account_asset
#: constraint:account.move.line:0
msgid "You can not create journal items on closed account."
msgstr "Konto je zaprt."
#. module: account_asset
#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
msgid ""
"From this report, you can have an overview on all depreciation. The tool "
"search can also be used to personalise your Assets reports and so, match "
"this analysis to your needs;"
msgstr ""
#. module: account_asset
#: help:account.asset.category,method_period:0
msgid "State here the time between 2 depreciations, in months"
msgstr ""
#. module: account_asset
#: field:account.asset.asset,method_number:0
#: selection:account.asset.asset,method_time:0
#: field:account.asset.category,method_number:0
#: selection:account.asset.category,method_time:0
#: field:account.asset.history,method_number:0
#: selection:account.asset.history,method_time:0
#: field:asset.modify,method_number:0
msgid "Number of Depreciations"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0
msgid "Create Move"
msgstr ""
#. module: account_asset
#: view:asset.depreciation.confirmation.wizard:0
msgid "Post Depreciation Lines"
msgstr ""
#. module: account_asset
#: view:account.asset.asset:0
msgid "Confirm Asset"
msgstr ""
#. module: account_asset
#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
msgid "Asset Hierarchy"
msgstr ""

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>

114
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>
@ -280,13 +288,15 @@
<field name="theoritical_amount" sum="Theoritical Amount"/> <field name="theoritical_amount" sum="Theoritical 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="general_budget_id"/> <field name="crossovered_budget_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="planned_amount"/>
</group>
</form> </form>
<graph type="bar" string="Lines"> <graph type="bar" string="Lines">
<field name="general_budget_id" /> <field name="general_budget_id" />

10
addons/account_budget/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-13 19:58+0000\n" "PO-Revision-Date: 2012-06-08 01:54+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-14 04:57+0000\n" "X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
"X-Generator: Launchpad (build 15070)\n" "X-Generator: Launchpad (build 15376)\n"
#. module: account_budget #. module: account_budget
#: field:crossovered.budget,creating_user_id:0 #: field:crossovered.budget,creating_user_id:0
@ -128,8 +128,8 @@ msgid ""
msgstr "" msgstr ""
"予算は将来の期間における、予想される会社の収入と支出です。予算に基づき、会社はその期間の間にどのくらいのお金を得るのかを注意深く見ることができます。そして" "予算は将来の期間における、予想される会社の収入と支出です。予算に基づき、会社はその期間の間にどのくらいのお金を得るのかを注意深く見ることができます。そして"
"、さまざまな分類に分配する最適な方法を理解することができます。お金がどこに行くのかを追跡し続けることで、お金の使い過ぎの可能性を減らし、財務目標を達成しや" "、さまざまな分類に分配する最適な方法を理解することができます。お金がどこに行くのかを追跡し続けることで、お金の使い過ぎの可能性を減らし、財務目標を達成しや"
"すくします。分析的なアカウントごとに期待される収入を詳細化することで予算を予測して下さい。そして、その期間中に実際にそれを実現することを基本にその展開を監" "すくします。分析的なアカウントごとに期待される収入を詳細化することで予算を予測します。そして、その期間中に実際にそれを実現することを基本にその展開を監視し"
"視して下さい。" "ます。"
#. module: account_budget #. module: account_budget
#: code:addons/account_budget/account_budget.py:119 #: code:addons/account_budget/account_budget.py:119

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>

14
addons/account_coda/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-05-11 23:57+0000\n" "PO-Revision-Date: 2012-06-08 02:01+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-05-13 04:43+0000\n" "X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
"X-Generator: Launchpad (build 15225)\n" "X-Generator: Launchpad (build 15376)\n"
#. module: account_coda #. module: account_coda
#: model:account.coda.trans.code,description:account_coda.actcc_09_21 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
@ -1150,7 +1150,7 @@ msgid ""
"CODA sequence number: %(coda)s\n" "CODA sequence number: %(coda)s\n"
"Paper Statement sequence number: %(paper)s" "Paper Statement sequence number: %(paper)s"
msgstr "" msgstr ""
"CODA処理により生成される銀行取引明細書の名前を作成するためのルールを定義して下さい。\n" "CODA処理により生成される銀行取引明細書の名前を作成するためのルールを定義します。\n"
"例えば、%(code)s%(y)s/%(paper)s\n" "例えば、%(code)s%(y)s/%(paper)s\n"
"\n" "\n"
"変数：\n" "変数：\n"
@ -1408,7 +1408,7 @@ msgstr "パートナ"
#: model:account.coda.trans.code,comment:account_coda.actcc_80_37 #: model:account.coda.trans.code,comment:account_coda.actcc_80_37
msgid "" msgid ""
"Fixed right, either one-off or periodical; for details, see \"categories\"" "Fixed right, either one-off or periodical; for details, see \"categories\""
msgstr "右固定、１回限りまたは定期的の何れか；詳細については分類参照して下さい。" msgstr "右固定、１回限りまたは定期的の何れか；詳細については分類を参照して下さい。"
#. module: account_coda #. module: account_coda
#: model:account.coda.trans.code,description:account_coda.actcc_04_05 #: model:account.coda.trans.code,description:account_coda.actcc_04_05
@ -2482,7 +2482,7 @@ msgstr "保険や株式仲介といった専門家のため"
#: model:account.coda.trans.code,comment:account_coda.actcc_80_19 #: model:account.coda.trans.code,comment:account_coda.actcc_80_19
msgid "" msgid ""
"Collected for securities, gold, pass-books, etc. placed in safe custody" "Collected for securities, gold, pass-books, etc. placed in safe custody"
msgstr "証券、金、銀行通帳などの収集物を保護預りして下さい。" msgstr "証券、金、銀行通帳などの収集物は保護預りされました。"
#. module: account_coda #. module: account_coda
#: model:account.coda.trans.code,comment:account_coda.actcc_09_19 #: model:account.coda.trans.code,comment:account_coda.actcc_09_19
@ -3009,7 +3009,7 @@ msgid ""
msgstr "" msgstr ""
"\n" "\n"
" 銀行取引明細書t %s 行 %s：\n" " 銀行取引明細書t %s 行 %s：\n"
" 銀行口座 %s は、このパートナに定義されていません %s\n" " 銀行口座 %s は、このパートナに定義されていません。 %s\n"
" 設定を訂正し再度インポートを実行するか、そうでない場合は生成された銀行取引明細書の対応するエントリーを変更して下さい。" " 設定を訂正し再度インポートを実行するか、そうでない場合は生成された銀行取引明細書の対応するエントリーを変更して下さい。"
#. module: account_coda #. module: account_coda

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>

12
addons/account_followup/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-05-12 05:34+0000\n" "PO-Revision-Date: 2012-06-09 02:19+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-05-13 04:43+0000\n" "X-Launchpad-Export-Date: 2012-06-10 04:37+0000\n"
"X-Generator: Launchpad (build 15225)\n" "X-Generator: Launchpad (build 15376)\n"
#. module: account_followup #. module: account_followup
#: view:account_followup.followup:0 #: view:account_followup.followup:0
@ -243,7 +243,7 @@ msgstr "参照"
#. module: account_followup #. module: account_followup
#: help:account_followup.followup.line,sequence:0 #: help:account_followup.followup.line,sequence:0
msgid "Gives the sequence order when displaying a list of follow-up lines." msgid "Gives the sequence order when displaying a list of follow-up lines."
msgstr "フォローアップ行のリスト表示の際の並び順を与えて下さい。" msgstr "フォローアップ行のリスト表示の際の並び順を与えます。"
#. module: account_followup #. module: account_followup
#: view:account.followup.print.all:0 #: view:account.followup.print.all:0
@ -346,7 +346,7 @@ msgstr ""
msgid "" msgid ""
"Your description is invalid, use the right legend or %% if you want to use " "Your description is invalid, use the right legend or %% if you want to use "
"the percent character." "the percent character."
msgstr "記述が無効です。正しい凡例またはパーセンテージ文字を使う場合は%%を使ってください。" msgstr "記述が無効です。正しい凡例またはパーセンテージ文字を使う場合は%%を使って下さい。"
#. module: account_followup #. module: account_followup
#: constraint:account.move.line:0 #: constraint:account.move.line:0
@ -374,7 +374,7 @@ msgstr "メッセージ"
#. module: account_followup #. module: account_followup
#: field:account_followup.stat,blocked:0 #: field:account_followup.stat,blocked:0
msgid "Blocked" msgid "Blocked"
msgstr "ブロック済" msgstr "ブロック"
#. module: account_followup #. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:299 #: code:addons/account_followup/wizard/account_followup_print.py:299

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"/>

8
addons/account_payment/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-05-15 06:19+0000\n" "PO-Revision-Date: 2012-06-08 02:11+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-05-16 04:50+0000\n" "X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
"X-Generator: Launchpad (build 15247)\n" "X-Generator: Launchpad (build 15376)\n"
#. module: account_payment #. module: account_payment
#: field:payment.order,date_scheduled:0 #: field:payment.order,date_scheduled:0
@ -260,7 +260,7 @@ msgid ""
"by you.'Directly' stands for the direct execution.'Due date' stands for the " "by you.'Directly' stands for the direct execution.'Due date' stands for the "
"scheduled date of execution." "scheduled date of execution."
msgstr "" msgstr ""
"支払オーダーのオプションを選択して下さい：固定は指定した日付を意味します。直接は直ちに実行を意味します。期日は実行のスケジュールされた日付を意味します。" "支払オーダーのオプション選択：固定は指定した日付を意味します。直接は直ちに実行を意味します。期日は実行のスケジュールされた日付を意味します。"
#. module: account_payment #. module: account_payment
#: code:addons/account_payment/account_move_line.py:110 #: code:addons/account_payment/account_move_line.py:110

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>

8
addons/analytic/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-05-15 06:05+0000\n" "PO-Revision-Date: 2012-06-08 23:38+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-05-16 04:50+0000\n" "X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
"X-Generator: Launchpad (build 15247)\n" "X-Generator: Launchpad (build 15376)\n"
#. module: analytic #. module: analytic
#: field:account.analytic.account,child_ids:0 #: field:account.analytic.account,child_ids:0
@ -213,7 +213,7 @@ msgstr "残高"
#. module: analytic #. module: analytic
#: 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: analytic #. module: analytic
#: help:account.analytic.account,type:0 #: help:account.analytic.account,type:0

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 Normal file
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" />

10
addons/audittrail/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:36+0000\n" "POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-05-18 23:37+0000\n" "PO-Revision-Date: 2012-06-08 02:18+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-05-20 04:38+0000\n" "X-Launchpad-Export-Date: 2012-06-09 05:39+0000\n"
"X-Generator: Launchpad (build 15259)\n" "X-Generator: Launchpad (build 15376)\n"
#. module: audittrail #. module: audittrail
#: code:addons/audittrail/audittrail.py:75 #: code:addons/audittrail/audittrail.py:75
@ -39,7 +39,9 @@ msgstr "申込済"
msgid "" msgid ""
"There is already a rule defined on this object\n" "There is already a rule defined on this object\n"
" You cannot define another: please edit the existing one." " You cannot define another: please edit the existing one."
msgstr "このオブジェクトでは既にルールが定義されているので、他のルールの定義ができません：既存のルールを変更して下さい。" msgstr ""
"このオブジェクトでは既にルールが定義されているので、\n"
"　他のルールの定義ができません：既存のルールを変更して下さい。"
#. module: audittrail #. module: audittrail
#: view:audittrail.rule:0 #: view:audittrail.rule:0

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>

113
addons/auth_openid/i18n/sk.po Normal file
View File

@ -0,0 +1,113 @@
# Slovak translation for openobject-addons
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
"PO-Revision-Date: 2012-06-09 09:35+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Slovak <sk@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-10 04:37+0000\n"
"X-Generator: Launchpad (build 15376)\n"
#. #-#-#-#-# auth_openid.pot (OpenERP Server 6.1rc1) #-#-#-#-#
#. module: auth_openid
#. #-#-#-#-# auth_openid.pot.web (PROJECT VERSION) #-#-#-#-#
#. openerp-web
#: view:res.users:0
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:12
msgid "OpenID"
msgstr "OpenID"
#. #-#-#-#-# auth_openid.pot (OpenERP Server 6.1rc1) #-#-#-#-#
#. module: auth_openid
#. #-#-#-#-# auth_openid.pot.web (PROJECT VERSION) #-#-#-#-#
#. openerp-web
#: field:res.users,openid_url:0
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:47
msgid "OpenID URL"
msgstr "OpenID URL"
#. module: auth_openid
#: help:res.users,openid_email:0
msgid "Used for disambiguation in case of a shared OpenID URL"
msgstr ""
#. module: auth_openid
#: sql_constraint:res.users:0
msgid "You can not have two users with the same login !"
msgstr "Nemôžte mať dvoch používateľov s rovnakým pristúpovým menom!"
#. module: auth_openid
#: field:res.users,openid_email:0
msgid "OpenID Email"
msgstr "OpenID Email"
#. module: auth_openid
#: constraint:res.users:0
msgid "The chosen company is not in the allowed companies for this user"
msgstr ""
"Zvolená spoločnosť nie je medzi povolenými spoločnosťami tohto používateľa"
#. module: auth_openid
#: field:res.users,openid_key:0
msgid "OpenID Key"
msgstr "OpenID Kľúč"
#. module: auth_openid
#: model:ir.model,name:auth_openid.model_res_users
msgid "res.users"
msgstr "res.users"
#. openerp-web
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:8
msgid "Password"
msgstr "Heslo"
#. openerp-web
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:9
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
msgid "Google"
msgstr "Google"
#. openerp-web
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
msgid "Google Apps"
msgstr "Google Apps"
#. openerp-web
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:11
msgid "Launchpad"
msgstr "Launchpad"
#. openerp-web
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:20
msgid "Google Apps Domain:"
msgstr ""
#. openerp-web
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:24
msgid "Username:"
msgstr "Užívateľské meno:"
#. openerp-web
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:28
msgid "OpenID URL:"
msgstr "OpenID URL:"
#. openerp-web
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:35
msgid "Google Apps Domain"
msgstr "Doména Google Apps"
#. openerp-web
#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:41
msgid "Username"
msgstr "Užívateľské meno:"

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