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

[MERGE] merged with maint runk 

bzr revid: qdp-launchpad@openerp.com-20120629123618-z1bv3dqdfqy23hno
This commit is contained in:
Quentin (OpenERP) 2012-06-29 14:36:18 +02:00
parent a642b36339 37601079a9
commit 6fe94bd4bc
283 changed files with 4524 additions and 3088 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/account/account_installer.xml
View File

@ -9,7 +9,6 @@
<form position="attributes" version="7.0">
<attribute name="string">Accounting Application Configuration</attribute>
</form>
<button name="action_skip" position="replace"/>
<button name="action_next" position="attributes">
<attribute name="string">Continue</attribute>
</button>

12
addons/account/account_invoice_view.xml
View File

@ -148,9 +148,8 @@
<form version="7.0">
<header>
<span groups="base.group_user">
<button name="invoice_open" states="draft" string="Validate" class="oe_highlight"/>
<button name="invoice_open" states="proforma2" string="Validate"/>
<button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid'/>
<button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight"/>
<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="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."/>
@ -286,8 +285,8 @@
<button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
<button name="action_cancel_draft" states="cancel" string="Reset 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="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->
</span>
<!--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"}'/>
</header>
<sheet string="Invoice">
@ -324,8 +323,9 @@
<field domain="[('company_id', '=', company_id),('type','=', 'receivable')]"
name="account_id" groups="account.group_account_user"/>
<field name="currency_id"/>
<div groups="base.group_user">
<label for="currency_id"/>
<div>
<field name="currency_id" class="oe_inline"/>
<button name="%(action_account_change_currency)d" type="action"
icon="terp-stock_effects-object-colorize"
attrs="{'invisible':[('state','!=','draft')]}"

1
addons/account/account_menuitem.xml
View File

@ -41,7 +41,6 @@
sequence="25"/>
<menuitem id="menu_finance_periodical_processing_billing" name="Billing" parent="menu_finance_periodical_processing" sequence="35"/>
<menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
<menuitem id="next_id_22" name="Partners" parent="menu_finance_generic_reporting" sequence="1"/>
<menuitem id="menu_multi_currency" name="Multi-Currencies" parent="menu_finance_generic_reporting" sequence="10"/>
<menuitem

28
addons/account/account_view.xml
View File

@ -13,8 +13,8 @@
<field name="arch" type="xml">
<form version="7.0">
<header>
<button name="create_period" states="draft" string="Create Monthly Periods" type="object"/>
<button name="create_period3" states="draft" string="Create 3 Months Periods" type="object"/>
<button name="create_period" states="draft" string="Create Monthly Periods" type="object" class="oe_highlight"/>
<button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" class="oe_highlight"/>
<field name="state" widget="statusbar" nolabel="1" />
</header>
<sheet string="Fiscalyear" >
@ -171,7 +171,7 @@
<form string="Account" version="7.0">
<label for="name" class="oe_edit_only" string="Account Name and Code:"/>
<h1>
<field name="name"/> -
<field name="name"/> -
<field name="code"/>
</h1>
<label for="company_id"/>
@ -592,8 +592,8 @@
<field name="arch" type="xml">
<form string="Bank Statement" version="7.0">
<header>
<button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
<button name="button_dummy" states="draft" string="Compute" type="object"/>
<button name="button_confirm_bank" states="draft" string="Confirm" type="object" class="oe_highlight"/>
<button name="button_dummy" states="draft" string="Compute" type="object" class="oe_highlight"/>
<button name="button_cancel" states="confirm" string="Cancel" type="object"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
</header>
@ -1268,7 +1268,7 @@
<field name="arch" type="xml">
<form version="7.0">
<header>
<button name="button_validate" states="draft" string="Post" type="object"/>
<button name="button_validate" states="draft" string="Post" type="object" class="oe_highlight"/>
<button name="button_cancel" states="posted" string="Cancel" type="object"/>
<field name="state" widget="statusbar"/>
</header>
@ -1284,10 +1284,10 @@
<field name="partner_id" invisible="1"/>
<field name="amount" invisible="1"/>
</group>
<notebook colspan="4">
<notebook>
<page string="Journal Items">
<field name="balance" invisible="1"/>
<field colspan="4" name="line_id" widget="one2many_list"
<field name="line_id" widget="one2many_list"
on_change="onchange_line_id(line_id)"
context="{'balance': balance , 'journal': journal_id }">
<form string="Journal Item" version="7.0">
@ -1824,8 +1824,8 @@
<form string="Recurring" version="7.0">
<header>
<button name="state_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" />
<button name="compute" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
<button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove"/>
<button name="compute" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific" class="oe_highlight"/>
<button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove" class="oe_highlight"/>
<field name="state" widget="statusbar" statusbar_visible="draft,running,done"/>
</header>
<sheet>
@ -1983,8 +1983,7 @@
<field name="arch" type="xml">
<form string="Create Account" version="7.0">
<header>
<button icon="gtk-ok" name="action_create" string="Add" type="object"/>
<button icon="gtk-cancel" special="cancel" string="Cancel" name="action_cancel" type="object"/>
<button icon="gtk-ok" name="action_create" string="Add" type="object" class="oe_highlight" />
</header>
<separator col="4" colspan="4" string="Create an Account Based on this Template"/>
<field name="cparent_id"/>
@ -2355,7 +2354,6 @@
<form position="attributes" version="7.0">
<attribute name="string">Accounting Application Configuration</attribute>
</form>
<button name="action_skip" position="replace"/>
<group string="res_config_contents" position="replace">
<field name="only_one_chart_template" invisible="1"/>
<field name="complete_tax_set" invisible="1"/>
@ -2544,8 +2542,8 @@ action = pool.get('res.config').next(cr, uid, [], context)
<field name="arch" type="xml">
<form version="7.0">
<header>
<button name="button_confirm_cash" states="open" string="Close CashBox" type="object"/>
<button name="button_open" states="draft" string="Open CashBox" type="object"/>
<button name="button_confirm_cash" states="open" string="Close CashBox" type="object" class="oe_highlight"/>
<button name="button_open" states="draft" string="Open CashBox" type="object" class="oe_highlight"/>
<button name="button_cancel" states="confirm,open" string="Cancel" type="object" groups="base.group_extended"/>
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
</header>

28
addons/account/i18n/nl.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-06-20 16:17+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"PO-Revision-Date: 2012-06-28 12:47+0000\n"
"Last-Translator: Erwin <Unknown>\n"
"Language-Team: \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-22 04:36+0000\n"
"X-Generator: Launchpad (build 15461)\n"
"X-Launchpad-Export-Date: 2012-06-29 04:38+0000\n"
"X-Generator: Launchpad (build 15505)\n"
#. module: account
#: code:addons/account/account.py:1307
@ -2374,7 +2374,7 @@ msgid ""
"There is no default default credit account defined \n"
"on journal \"%s\""
msgstr ""
"Er is geen default krediet rekening beschikbaar \n"
"Er is geen standaard credit rekening beschikbaar \n"
"voor journaal \"%s\""
#. module: account
@ -2969,8 +2969,8 @@ msgid ""
"You can not delete an invoice which is open or paid. We suggest you to "
"refund it instead."
msgstr ""
"Een factuur die open of betaald is kan u niet verwijderen. In plaats daarvan "
"stellen we voor dat u ze terugbetaald."
"Een factuur die open of betaald is kunt u niet verwijderen. In plaats "
"daarvan kunt u een creditfactuur maken.."
#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
@ -4486,6 +4486,10 @@ msgid ""
"you want to generate accounts of this template only when loading its child "
"template."
msgstr ""
"Vink deze optie uit indien u niet wilt dat dit sjabloon actief wordt "
"gebruikt in de wizard, welke het grootboekrekeningschema genereerd van "
"sjablonen. Gebruik dit alleen indien u rekeningen wilt genereren van dit "
"sjabloon bij het laden van het onderliggende sjaboon."
#. module: account
#: view:account.use.model:0
@ -4578,7 +4582,7 @@ msgstr "Journaalposten boeken"
#: selection:account.invoice.report,state:0
#: selection:report.invoice.created,state:0
msgid "Cancelled"
msgstr "Afgebroken"
msgstr "Geannuleerd"
#. module: account
#: help:account.bank.statement,balance_end_cash:0
@ -4711,7 +4715,7 @@ msgstr "Opbrengsten rekening op product sjabloon"
#: code:addons/account/account.py:3120
#, python-format
msgid "MISC"
msgstr "DIV"
msgstr "MEM"
#. module: account
#: model:email.template,subject:account.email_template_edi_invoice
@ -5312,7 +5316,7 @@ msgstr "Sjabloon belasting fiscale positie"
#. module: account
#: field:account.journal,update_posted:0
msgid "Allow Cancelling Entries"
msgstr "Maak verwijderen boekingen mogelijk"
msgstr "Maak het annuleren boekingen mogelijk"
#. module: account
#: field:account.tax.code,sign:0
@ -5748,7 +5752,7 @@ msgstr "Aanmaakdatum"
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
#: model:ir.ui.menu,name:account.account_def_analytic_journal
msgid "Analytic Journals"
msgstr "Kostenplaatsen"
msgstr "Kostenplaats dagboeken"
#. module: account
#: field:account.account,child_id:0
@ -6896,7 +6900,7 @@ msgstr ""
#: view:account.move:0
#: field:account.move,to_check:0
msgid "To Review"
msgstr "Na te kijken"
msgstr "Ter controle"
#. module: account
#: help:account.partner.ledger,initial_balance:0

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Select Period" version="7.0">
<header>
<button name="check_report" string="Print" type="object" icon="gtk-print"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group col="4">
<field name="date1"/>

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Analytic Account Charts" version="7.0">
<header>
<button name="analytic_account_chart_open_window" string="Open Charts" type="object" icon="gtk-ok"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="analytic_account_chart_open_window" string="Open Charts" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="Select the Period for Analysis" col="4">
<field name="from_date"/>

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Select period" version="7.0">
<header>
<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" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="Cost Ledger for Period" col="4">
<field name="date1"/>

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Select Period" version="7.0">
<header>
<button name="check_report" string="Print" type="object" icon="gtk-print"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group col="4">
<field name="date1"/>

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Select Period" version="7.0">
<header>
<button name="check_report" string="Print" type="object" icon="gtk-print"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group col="4">
<field name="date1"/>

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Select Period" version="7.0">
<header>
<button name="check_report" string="Print" type="object" icon="gtk-print"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group col="4">
<field name="date1"/>

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="View Account Analytic Lines" version="7.0">
<header>
<button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button string="Open Entries" name="action_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group col="4">
<field name="from_date"/>

2
addons/account/report/account_analytic_entries_report_view.xml
View File

@ -91,7 +91,7 @@
<menuitem action="action_analytic_entries_report"
id="menu_action_analytic_entries_report"
groups="analytic.group_analytic_accounting"
parent="account.menu_finance_statistic_report_statement" sequence="4"/>
parent="account.menu_finance_reporting" sequence="4"/>
</data>
</openerp>

2
addons/account/report/account_entries_report_view.xml
View File

@ -133,7 +133,7 @@
<field name="help">From this view, have an analysis of your different financial accounts. The document shows your debit and credit taking in consideration some criteria you can choose by using the search tool.</field>
</record>
<menuitem action="action_account_entries_report_all" id="menu_action_account_entries_report_all"
parent="account.menu_finance_statistic_report_statement"
parent="account.menu_finance_reporting"
groups="group_account_manager"
sequence="2"/>
</data>

2
addons/account/report/account_invoice_report_view.xml
View File

@ -131,7 +131,7 @@
</record>
<menuitem action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.menu_finance_statistic_report_statement" sequence="0"/>
<menuitem action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.menu_finance_reporting" sequence="0"/>
<act_window
id="act_account_invoice_partner_relation"

2
addons/account/report/account_treasury_report_view.xml
View File

@ -56,7 +56,7 @@
<field name="help">From this view, have an analysis of your treasury. It sums the balance of every accounting entries made on liquidity accounts per period.</field>
</record>
<menuitem action="action_account_treasury_report_all" id="menu_action_account_treasury_report_all"
parent="account.menu_finance_statistic_report_statement"
parent="account.menu_finance_reporting"
groups="group_account_manager"
sequence="2"/>
</data>

5
addons/account/res_config_view.xml
View File

@ -17,8 +17,9 @@
<field name="arch" type="xml">
<form string="Configure Accounting" version="7.0">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
<button string="Cancel" type="object" name="cancel"/>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<sheet>
<field name="has_default_company" invisible="1" />

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Reconciliation" version="7.0">
<header>
<button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="reconcile" string="Reconcile" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<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."/>
@ -53,9 +54,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Reconciliation Result" version="7.0">
<header>
<button special="cancel" string="Ok" icon="terp-dialog-close" default_focus="1"/>
</header>
<group>
<field name="reconciled"/>
<field name="unreconciled"/>

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

@ -8,8 +8,9 @@
<field name="arch" type="xml">
<form string="Invoice Currency" version="7.0">
<header>
<button name="change_currency" string="Change Currency" type="object" icon="terp-stock_effects-object-colorize"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="change_currency" string="Change Currency" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="This wizard will change the currency of the invoice">
<field name="currency_id"/>

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

@ -8,8 +8,9 @@
<field name="arch" type="xml">
<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"/>
<button string="Open Charts" name="account_chart_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group colspan="4">
<field name="fiscalyear" on_change="onchange_fiscalyear(fiscalyear)"/>

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

@ -7,15 +7,14 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Close states of Fiscal year and periods" version="7.0">
<header>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object"/>
</header>
<separator string="Close states of Fiscal year and periods"/>
<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 "/>
<group>
<field name="fy_id" domain="[('state','=','draft')]"/>
</group>
<header>
<button icon="terp-locked" string="Close Fiscalyear" name="data_save" type="object" class="oe_highlight" />
</header>
<separator string="Close states of Fiscal year and periods"/>
<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 "/>
<group>
<field name="fy_id" domain="[('state','=','draft')]"/>
</group>
</form>
</field>
</record>

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

@ -8,8 +8,9 @@
<field name="arch" type="xml">
<form string="Generate Fiscal Year Opening Entries" version="7.0">
<header>
<button icon="gtk-execute" string="Create" name="data_save" type="object"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button string="Create" name="data_save" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Generate Fiscal Year Opening Entries"/>
<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."/>

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Credit Note" version="7.0">
<header>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button string='Refund' icon="gtk-execute" name="invoice_refund" type="object"/>
<button string='Refund' name="invoice_refund" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Credit Note Options"/>
<group col="4">

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

@ -6,13 +6,14 @@
<field name="model">account.invoice.confirm</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Confirm Draft Invoices" version="7.0">
<separator string="Confirm Draft Invoices" colspan="4"/>
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Close"/>
<button icon="terp-camera_test" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1"/>
</group>
</form>
<form string="Confirm Draft Invoices" version="7.0">
<header>
<button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Confirm Draft Invoices"/>
</form>
</field>
</record>
@ -27,13 +28,14 @@
<field name="model">account.invoice.cancel</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Cancel Selected Invoices" version="7.0">
<separator string="Cancel Selected Invoices" colspan="4"/>
<group colspan="4" col="6">
<button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
<button icon="terp-dialog-close" special="cancel" string="Close"/>
</group>
</form>
<form string="Cancel Selected Invoices" version="7.0">
<header>
<button string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Cancel Selected Invoices"/>
</form>
</field>
</record>

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

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

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

@ -8,8 +8,9 @@
<field name="arch" type="xml">
<form string="Bank reconciliation" version="7.0">
<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"/>
<button string="Open for Bank Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="journal_id"/>

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

@ -103,23 +103,21 @@ class account_move_journal(osv.osv_memory):
period_string = _("Period: %s") % tools.ustr(period)
separator_string = _("Open Journal Items !")
cancel_string = _("Cancel")
open_string = _("Open")
view = """<?xml version="1.0" encoding="utf-8"?>
<form string="Standard entries">
<form string="Standard entries" version="7.0">
<header>
<button icon="terp-gtk-go-back-rtl" string="%s" name="action_open_window" default_focus="1" type="object"/>
<button icon="gtk-cancel" special="cancel" string="%s"/>
<button string="%s" name="action_open_window" default_focus="1" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="%s" colspan="4">
<group string="%s">
<field name="target_move" />
</group>
<group colspan="4" >
<label width="300" string="%s"/>
<newline/>
<label width="300" string="%s"/>
</group>
</form>""" % (open_string, cancel_string, separator_string, journal_string, period_string)
<label width="300" string="%s"/>
<newline/>
<label width="300" string="%s"/>
</form>""" % (open_string, separator_string, journal_string, period_string)
view = etree.fromstring(view.encode('utf8'))
xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)

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

@ -8,8 +8,9 @@
<field name="arch" type="xml">
<form string="Reconciliation" version="7.0">
<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" />
<button string="Open for Reconciliation" name="action_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="account_id"/>

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

@ -9,10 +9,11 @@
<field name="arch" type="xml">
<form string="Account Select" version="7.0">
<header>
<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 string="Open Entries" name="open_window" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<label string="Are you sure you want to open Account move line entries!"/>
<label string="Are you sure you want to open Account move line entries?"/>
</form>
</field>
</record>

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

@ -8,8 +8,9 @@
<field name="arch" type="xml">
<form string="Unreconciliation" version="7.0">
<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" />
<button string="Open for Unreconciliation" name="action_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="account_id"/>

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

@ -8,8 +8,9 @@
<field name="arch" type="xml">
<form string="Choose Fiscal Year " version="7.0">
<header>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/>
<button string="Open" name="remove_entries" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="fyear_id" domain="[('state','=','draft')]"/>

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

@ -9,11 +9,11 @@
<field name="arch" type="xml">
<form string="Close Period" version="7.0">
<header>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-gtk-go-back-rtl" string="Close Period" name="data_save" type="object"/>
<button string="Close Period" name="data_save" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Are you sure?" colspan="4"/>
<group>
<group string="Are you sure?">
<field name="sure"/>
</group>
</form>

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

@ -8,8 +8,7 @@
<field name="arch" type="xml">
<form string="Partner Reconciliation" version="7.0">
<header>
<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"/>
<button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" class="oe_highlight" />
</header>
<group col="4">
<field name="next_partner_id"/>

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

@ -9,10 +9,11 @@
<field name="arch" type="xml">
<form string="Reconciliation" version="7.0">
<header>
<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="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 string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}" class="oe_highlight"/>
<button string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
<button string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group col="4" string="Reconciliation Transactions">
<field name="trans_nbr"/>
@ -51,8 +52,9 @@
<field name="arch" type="xml">
<form string="Information addendum" version="7.0">
<header>
<button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button string="Reconcile" name="trans_rec_reconcile" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="Write-Off Move" col="4">
<field name="journal_id"/>

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

@ -10,8 +10,9 @@
<field name="arch" type="xml">
<form string="Report Options" version="7.0">
<header>
<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"/>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</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. "/>

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Report Options" version="7.0">
<header>
<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"/>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<label string=""/> <!-- binding for inherited views -->
<group col="4">

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

@ -9,10 +9,12 @@
<field name="arch" type="xml">
<form string="Open Invoice" version="7.0">
<header>
<button name="change_inv_state" string="Yes" type="object" icon="terp-camera_test"/>
<button special="cancel" string="No" icon="terp-gtk-stop"/>
<button name="change_inv_state" string="Yes" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<label string="Are you sure you want to open this invoice ?"/>
<newline/>
<label string="(Invoice should be unreconciled if you want to open it)"/>
</form>
</field>

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

@ -9,9 +9,9 @@
<field name="arch" type="xml">
<form string="Subscription Compute" version="7.0">
<header>
<button icon="gtk-cancel" special="cancel" string="Cancel" />
<button icon="gtk-execute" string="Generate Entries"
name="action_generate" type="object" />
<button string="Generate Entries" name="action_generate" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<separator string="Generate Entries before:"/>
<label string ="Automatically generate entries based on what has been entered in the system before a specific date."/>

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Account tax charts" version="7.0">
<header>
<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" />
<button string="Open Charts" name="account_tax_chart_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="period_id"/>

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Unreconciliation" version="7.0">
<header>
<button icon="gtk-ok" string="Unreconcile" name="trans_unrec" type="object" default_focus="1"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button string="Unreconcile" name="trans_unrec" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Unreconciliate 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 disabled"/>
@ -43,8 +44,7 @@
<field name="arch" type="xml">
<form string="Unreconciliation" version="7.0">
<header>
<button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-ok" string="Unreconcile" name="trans_unrec_reconcile" type="object" default_focus="1" class="oe_highlight" />
</header>
<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"/>

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

@ -7,17 +7,18 @@
<field name="model">account.use.model</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Create Entries From Models" version="7.0">
<header>
<button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
</header>
<separator string="This wizard will create recurring accounting entries"/>
<label string="Create manual recurring entries in a chosen journal."/>
<group>
<field name="model"/>
</group>
</form>
<form string="Create Entries From Models" version="7.0">
<header>
<button string="Create Entries" name="create_entries" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="This wizard will create recurring accounting entries"/>
<label string="Create manual recurring entries in a chosen journal."/>
<group>
<field name="model"/>
</group>
</form>
</field>
</record>
@ -40,8 +41,9 @@
<field name="arch" type="xml">
<form string="Use Model" version="7.0">
<header>
<button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button string="Ok" name="create_entries" type="object" default_focus='1' class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<label string = "Are you sure you want to create entries?"/>
</form>

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

@ -8,18 +8,19 @@
<field name="model">validate.account.move</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Post Journal Entries" version="7.0">
<header>
<button icon="terp-camera_test" string="Approve" name="validate_move" type="object"/>
<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 string="Post Journal Entries" version="7.0">
<header>
<button string="Approve" name="validate_move" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="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>
</field>
</record>
@ -46,14 +47,15 @@
<field name="model">validate.account.move.lines</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Post Journal Entries" version="7.0">
<header>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-camera_test" string="Approve" name="validate_move_lines" type="object" default_focus="1"/>
</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 string="Post Journal Entries" version="7.0">
<header>
<button string="Approve" name="validate_move_lines" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</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."/>
</form>
</field>
</record>

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Taxes Report" version="7.0">
<header>
<button name="create_vat" string="Print Tax Statement" type="object" icon="gtk-ok"/>
<button icon='gtk-cancel' special="cancel" string="Cancel" />
<button name="create_vat" string="Print Tax Statement" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</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">

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Crossovered Analytic" version="7.0">
<header>
<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="print_report" string="Print" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group col="4">
<field name="date1"/>

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

@ -8,8 +8,9 @@
<field name="arch" type="xml">
<form string="Distribution Model Saved" version="7.0">
<header>
<button string="Ok" icon='gtk-execute' type="object" name="activate" default_focus="1"/>
<button special="cancel" string="Cancel" icon='gtk-ok' />
<button string="Ok" type="object" name="activate" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<label string="Save This Distribution as a Model"/>
</form>
@ -22,9 +23,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Distribution Model Saved" version="7.0">
<header>
<button special="cancel" string="Ok" icon='gtk-ok'/>
</header>
<label string="This distribution model has been saved.You will be able to reuse it later."/>
</form>
</field>

6
addons/account_asset/account_asset_view.xml
View File

@ -82,9 +82,9 @@
<field name="arch" type="xml">
<form string="Asset" version="7.0">
<header>
<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_draft" states="open" string="Set to Draft" type="object"/>
<button name="validate" states="draft" string="Confirm Asset" type="object" class="oe_highlight"/>
<button name="set_to_close" states="open" string="Set to Close" type="object" class="oe_highlight"/>
<button name="set_to_draft" states="open" string="Set to Draft" type="object" />
<field name="state" widget="statusbar" statusbar_visible="draft,open"/>
</header>
<sheet>

14
addons/account_asset/i18n/nl.po
View File

@ -8,14 +8,14 @@ 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-01-15 12:39+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"PO-Revision-Date: 2012-06-28 12:49+0000\n"
"Last-Translator: Erwin <Unknown>\n"
"Language-Team: Dutch <nl@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-05-11 05:14+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-29 04:38+0000\n"
"X-Generator: Launchpad (build 15505)\n"
#. module: account_asset
#: view:account.asset.asset:0
@ -440,12 +440,12 @@ msgstr "Tijdmethode"
#. module: account_asset
#: view:account.asset.category:0
msgid "Analytic Information"
msgstr ""
msgstr "Kostenplaats informatie"
#. module: account_asset
#: view:asset.modify:0
msgid "Asset Durations to Modify"
msgstr ""
msgstr "Activa duur aan te passen"
#. module: account_asset
#: constraint:account.move.line:0
@ -623,7 +623,7 @@ msgstr "Prorata Temporis"
#. module: account_asset
#: view:account.asset.category:0
msgid "Accounting Information"
msgstr ""
msgstr "Boekhoudinformatie"
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_invoice

2
addons/account_asset/report/account_asset_report_view.xml
View File

@ -90,6 +90,6 @@
<menuitem action="action_asset_asset_report"
id="menu_action_asset_asset_report"
parent="account.menu_finance_statistic_report_statement"/>
parent="account.menu_finance_reporting"/>
</data>
</openerp>

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Modify Asset" version="7.0">
<header>
<button name="modify" string="Modify" type="object" icon="terp-camera_test"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="modify" string="Modify" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="Asset Durations to Modify" col="4">
<field name="name" colspan="4"/>

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

@ -8,8 +8,9 @@
<field name="arch" type="xml">
<form string="Compute Asset" version="7.0">
<header>
<button icon="gtk-execute" string="Compute" name="asset_compute" type="object"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button string="Compute" name="asset_compute" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="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."/>

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

@ -11,8 +11,9 @@
<field name="arch" type="xml">
<form string="Confirm selected statement lines" version="7.0">
<header>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-execute" string="Confirm Lines" name="confirm_lines" type="object"/>
<button string="Confirm Lines" name="confirm_lines" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<label string="Are you sure you want to confirm the selected Bank Statement lines ?"/>
<label string="Confirmed lines cannot be changed anymore."/>

8
addons/account_budget/account_budget_view.xml
View File

@ -109,10 +109,10 @@
<field name="arch" type="xml">
<form version="7.0">
<header>
<button string="Confirm" name="confirm" states="draft" type="workflow" />
<button string="Approve" name="validate" states="confirm" type="workflow"/>
<button string="Done" name="done" states="validate" type="workflow" />
<button name="draft" states="cancel" string="Reset to Draft" type="workflow"/>
<button string="Confirm" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
<button string="Approve" name="validate" states="confirm" type="workflow" class="oe_highlight"/>
<button string="Done" name="done" states="validate" type="workflow" class="oe_highlight"/>
<button name="draft" states="cancel" string="Reset to Draft" type="workflow" />
<button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
<field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
</header>

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Select Dates Period" version="7.0">
<header>
<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" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="This wizard is used to print budget" col="4">
<field name="date_from"/>

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Select Dates Period" version="7.0">
<header>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="This wizard is used to print budget" col="4">
<field name="date_from"/>

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Select Dates Period" version="7.0">
<header>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="This wizard is used to print summary of budgets">
<field name="date_from"/>

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Select Dates Period" version="7.0">
<header>
<button name="check_report" string="Print" type="object" icon="gtk-print" default_focus="1"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="Print Budgets" col="4">
<field name="date_from"/>

4
addons/account_check_writing/account_voucher_view.xml
View File

@ -3,7 +3,7 @@
<data>
<!-- Supplier voucher view -->
<record model="ir.ui.view" id="view_vendor_payment_check_form">
<field name="name">account.voucher.payment.check.form</field>
<field name="model">account.voucher</field>
@ -20,7 +20,7 @@
<field name="number" attrs="{'readonly':[('allow_check','!=',1)]}" />
</field>
<button name="proforma_voucher" position="after">
<button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',1),('state','!=','posted') ]}"/>
<button name="print_check" icon="gtk-print" string="Print Check" type="object" attrs="{'invisible':['|',('allow_check','!=',1),('state','!=','posted') ]}" class="oe_highlight"/>
</button>
</field>
</record>

12
addons/account_coda/account_coda_wizard.xml
View File

@ -10,8 +10,9 @@
<field name="arch" type="xml">
<form string="Import CODA File" version="7.0">
<header>
<button name="coda_parsing" string="_Import" type="object" icon="gtk-ok"/>
<button special="cancel" string="_Cancel" icon="gtk-cancel"/>
<button name="coda_parsing" string="_Import" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group col="2" string="Select Your File :">
<field name="coda_data" filename="coda_fname"/>
@ -29,9 +30,10 @@
<field name="arch" type="xml">
<form string="Import CODA File" version="7.0">
<header>
<button name="action_open_coda_statements" string="View CODA Bank Statement(s)" type="object" icon="gtk-apply"/>
<button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" icon="gtk-apply"/>
<button special="cancel" string="Close" icon="gtk-cancel"/>
<button name="action_open_coda_statements" string="View CODA Bank Statement(s)" type="object" class="oe_highlight"/>
<button name="action_open_bank_statements" string="View Bank Statement(s)" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="Results :">
<field name="note" nolabel="1" colspan="2"/>

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Send follow-ups" version="7.0">
<header>
<button name="do_continue" string="Continue" colspan="1" type="object" icon="gtk-ok"/>
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="do_continue" string="Continue" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="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."/>
@ -77,9 +78,10 @@
<field name="arch" type="xml">
<form string="Send follow-ups" version="7.0">
<header>
<button name="do_mail" string="Send Mails" colspan="1" type="object" icon="gtk-execute"/>
<button name="do_print" string="Print Follow Ups" colspan="1" type="object" icon="gtk-print"/>
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="do_mail" string="Send Mails" type="object" class="oe_highlight"/>
<button name="do_print" string="Print Follow Ups" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<notebook>
<page string="Partner Selection">
@ -116,9 +118,6 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Summary" version="7.0">
<header>
<button special="cancel" string="Ok" icon='gtk-cancel'/>
</header>
<separator string="Summary"/>
<field name="summary"/>
</form>

4
addons/account_payment/account_payment_view.xml
View File

@ -106,8 +106,8 @@
<field name="arch" type="xml">
<form version="7.0">
<header>
<button name="open" states="draft" string="Confirm Payments" />
<button name="set_done" states="open" string="Make Payments" type="object"/>
<button name="open" states="draft" string="Confirm Payments" class="oe_highlight"/>
<button name="set_done" states="open" string="Make Payments" type="object" class="oe_highlight"/>
<button name="set_to_draft" states="cancel" string="Set to draft" type="object"/>
<button name="cancel" states="draft,open" string="Cancel"/>
<field name="state" widget="statusbar" statusbar_visible="draft,open"/>

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Search Payment lines" version="7.0">
<header>
<button name="search_entries" string="Search" colspan="1" type="object" icon="gtk-execute"/>
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="search_entries" string="Search" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="duedate" />
@ -26,11 +27,13 @@
<field name="arch" type="xml">
<form string="Search Payment lines" version="7.0">
<header>
<button name="create_payment" string="_Add to payment order" colspan="1" type="object" icon="gtk-execute"/>
<button special="cancel" string="Cancel" icon='gtk-cancel'/>
<button name="create_payment" string="_Add to payment order" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Entries"/>
<field name="entries"/>
<group string="Entries">
<field name="entries"/>
</group>
</form>
</field>
</record>

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Make Payment" version="7.0">
<header>
<button name="launch_wizard" string="Yes" type="object" icon="gtk-ok" default_focus="1"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="launch_wizard" string="Yes" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Are you sure you want to make payment?"/>
</form>

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

@ -9,10 +9,13 @@
<field name="arch" type="xml">
<form string="Populate Statement:" version="7.0">
<header>
<button name="populate_statement" string="ADD" type="object" icon="gtk-ok"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="populate_statement" string="ADD" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<field name="lines"/>
<group>
<field name="lines"/>
</group>
</form>
</field>
</record>

2
addons/account_voucher/account_voucher_view.xml
View File

@ -43,7 +43,7 @@
<field name="arch" type="xml">
<form version="7.0">
<header>
<button name="proforma_voucher" string="Post" states="draft"/>
<button name="proforma_voucher" string="Post" states="draft" class="oe_highlight"/>
<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="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>

2
addons/account_voucher/report/account_voucher_sales_receipt_view.xml
View File

@ -109,7 +109,7 @@
</record>
<menuitem action="action_sale_receipt_report_all" id="menu_action_sale_receipt_report_all" parent="account.menu_finance_statistic_report_statement" sequence="3"/>
<menuitem action="action_sale_receipt_report_all" id="menu_action_sale_receipt_report_all" parent="account.menu_finance_reporting" sequence="3"/>
</data>
</openerp>

33
addons/account_voucher/wizard/account_statement_from_invoice_view.xml
View File

@ -6,17 +6,16 @@
<field name="model">account.statement.from.invoice</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Import Invoices in Statement">
<group colspan="4" >
<form string="Import Invoices in Statement" version="7.0">
<header>
<button string="Go" name="search_invoices" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="date"/>
<newline/>
<field name="journal_ids" domain="[('type','in',['sale','purchase','cash'])]"/>
</group>
<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="Go" name="search_invoices" type="object"/>
</group>
</form>
</field>
</record>
@ -35,16 +34,14 @@
<field name="model">account.statement.from.invoice.lines</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Import Entries">
<group colspan="4" expand="1">
<separator string="Payable and Receivables" colspan="4"/>
<field height="300" width="700" name="line_ids" colspan="4" nolabel="1" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
</group>
<group colspan="4" col="6">
<label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-execute" string="Ok" name="populate_statement" type="object"/>
</group>
<form string="Import Entries" version="7.0">
<header>
<button string="Ok" name="populate_statement" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Payable and Receivables"/>
<field height="300" width="700" name="line_ids" domain="[('account_id.type','in',['receivable','payable']),('reconcile_id','=',False), ('reconcile_partial_id','=',False), ('state', '=', 'valid')]"/>
</form>
</field>
</record>

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

@ -9,8 +9,9 @@
<field name="arch" type="xml">
<form string="Unreconciliation" version="7.0">
<header>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" icon="gtk-ok"/>
<button name="trans_unrec" default_focus="1" string="Unreconcile" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<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"/>

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

@ -11,8 +11,9 @@
<field name="arch" type="xml">
<form string="Audit Logs" version="7.0">
<header>
<button icon="gtk-cancel" special="cancel" string="Cancel" />
<button icon="gtk-open" string="Open Logs" name="log_open_window" type="object" />
<button string="Open Logs" name="log_open_window" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group col="4">
<field name="from"/>

36
addons/base_calendar/base_calendar_view.xml
View File

@ -10,20 +10,10 @@
<field name="arch" type="xml">
<form string="Invitation details" version="7.0">
<header>
<button name="do_tentative"
states="needs-action,declined,accepted"
string="Uncertain" type="object"/>
<button name="do_accept" string="Accept"
states="needs-action,tentative,declined"
type="object" />
<button
name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
string="Delegate" type="action"
states="needs-action,tentative,declined,accepted"
context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
<button name="do_decline" string="Decline"
states="needs-action,tentative,accepted"
type="object" />
<button name="do_tentative" states="needs-action,declined,accepted" string="Uncertain" type="object" class="oe_highlight"/>
<button name="do_accept" string="Accept" states="needs-action,tentative,declined" type="object" class="oe_highlight"/>
<button name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" string="Delegate" type="action" states="needs-action,tentative,declined,accepted" context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
<button name="do_decline" string="Decline" states="needs-action,tentative,accepted" type="object" class="oe_highlight"/>
<field name="state" widget="statusbar"
statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
</header>
@ -216,21 +206,9 @@
<field name="arch" type="xml">
<form string="Events" version="7.0">
<header>
<button name="do_confirm"
string="Confirm"
states="tentative,cancelled"
type="object"
/>
<button name="do_tentative"
states="confirmed,cancelled"
string="Uncertain"
type="object"
/>
<button name="do_cancel"
string="Cancel"
states="tentative,confirmed"
type="object"
/>
<button name="do_confirm" string="Confirm" states="tentative,cancelled" type="object" class="oe_highlight"/>
<button name="do_tentative" states="confirmed,cancelled" string="Uncertain" type="object" class="oe_highlight"/>
<button name="do_cancel" string="Cancel" states="tentative,confirmed" type="object" />
<field name="state" widget="statusbar"
statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
</header>

10
addons/base_calendar/i18n/nl.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
"PO-Revision-Date: 2012-05-10 18:08+0000\n"
"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
"PO-Revision-Date: 2012-06-28 12:45+0000\n"
"Last-Translator: Erwin <Unknown>\n"
"Language-Team: Dutch <nl@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-05-11 05:12+0000\n"
"X-Generator: Launchpad (build 15225)\n"
"X-Launchpad-Export-Date: 2012-06-29 04:38+0000\n"
"X-Generator: Launchpad (build 15505)\n"
#. module: base_calendar
#: view:calendar.attendee:0
@ -1109,7 +1109,7 @@ msgstr "Details herinnering"
#. module: base_calendar
#: view:calendar.attendee:0
msgid "To Review"
msgstr "Na te kijken"
msgstr "Ter controle"
#. module: base_calendar
#: selection:calendar.alarm,state:0

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

@ -9,7 +9,12 @@
<field name="model">base_calendar.invite.attendee</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Invite People">
<form string="Invite People" version="7.0">
<header>
<button name="do_invite" string="Invite" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Invite People" colspan="4"/>
<field name="type"/>
<field name="send_mail"/>
@ -31,10 +36,6 @@
</group>
</page>
</notebook>
<group col="4" colspan="4">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button name="do_invite" string="Invite" type="object" icon="gtk-ok"/>
</group>
</form>
</field>
</record>

9
addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
View File

@ -7,10 +7,13 @@
<field name="model">create.relation.graph</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Generate Relationship Graph">
<form string="Generate Relationship Graph" version="7.0">
<header>
<button name="get_graph" string="Create Graphs" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="Relationship Graphs" colspan="6"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="get_graph" string="Create Graphs" type="object" icon="gtk-ok"/>
</form>
</field>
</record>

28
addons/base_module_record/wizard/base_module_record_data_view.xml
View File

@ -7,18 +7,19 @@
<field name="model">base.module.data</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Data Recording">
<field name="check_date"/>
<newline/>
<field name="filter_cond"/>
<separator string="Choose objects to record" colspan="4"/>
<field name="objects" colspan="4" nolabel="1"/>
<group><field name="info_yaml"/></group>
<separator colspan="4"/>
<group colspan="4" col="2">
<button icon="gtk-cancel" string="Cancel" special="cancel"/>
<button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
<form string="Data Recording" version="7.0">
<header>
<button name="record_objects" string="Record" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="check_date"/>
<field name="filter_cond"/>
</group>
<separator string="Choose objects to record"/>
<field name="objects"/>
<group><field name="info_yaml"/></group>
</form>
</field>
</record>
@ -57,11 +58,6 @@
<form string="Data Recording">
<separator string="Result, paste this to your module's xml" colspan="4" />
<field name="res_text" nolabel="1" colspan="4"/>
<separator colspan="4"/>
<group colspan="4" col="2">
<label string=""/>
<button icon="gtk-close" string="Close" special="cancel"/>
</group>
</form>
</field>
</record>

81
addons/base_module_record/wizard/base_module_record_object_view.xml
View File

@ -7,18 +7,19 @@
<field name="model">base.module.record</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Objects Recording">
<field name="check_date"/>
<newline/>
<field name="filter_cond"/>
<separator string="Choose objects to record" colspan="4"/>
<field name="objects" colspan="4" nolabel="1"/>
<group><field name="info_yaml"/></group>
<separator colspan="4"/>
<group colspan="4" col="2">
<button icon="gtk-cancel" string="Cancel" special="cancel"/>
<button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
<form string="Objects Recording" version="7.0">
<header>
<button name="record_objects" string="Record" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group>
<field name="check_date"/>
<field name="filter_cond"/>
</group>
<separator string="Choose objects to record"/>
<field name="objects"/>
<group><field name="info_yaml"/></group>
</form>
</field>
</record>
@ -59,18 +60,13 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Module Recording">
<separator string="Module successfully created!" colspan="4"/>
<field name="module_filename"/>
<newline/>
<field name="module_file"/>
<separator string="Information" colspan="4"/>
<label string="If you think your module could interest other people, we'd like you to publish it on http://www.openerp.com, in the 'Modules' section. You can do it through the website or using features of the 'base_module_publish' module." colspan="4" align="0.0"/>
<label string="Thanks in advance for your contribution." colspan="4" align="0.0"/>
<separator colspan="4"/>
<group colspan="4" col="2">
<label string=""/>
<button icon="gtk-close" string="Close" special="cancel"/>
<group string="Module successfully created!">
<field name="module_filename"/>
<field name="module_file"/>
</group>
<separator string="Information"/>
<label string="If you think your module could interest other people, we'd like you to publish it on http://www.openerp.com, in the 'Modules' section. You can do it through the website or using features of the 'base_module_publish' module." align="0.0"/>
<label string="Thanks in advance for your contribution." align="0.0"/>
</form>
</field>
</record>
@ -89,22 +85,23 @@
<field name="model">base.module.record.objects</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Module Recording">
<separator string="Module Information" colspan="4"/>
<field name="name"/>
<field name="directory_name"/>
<field name="version"/>
<field name="author"/>
<field name="website" colspan="4"/>
<field name="category" colspan="4"/>
<field name="data_kind"/>
<newline/>
<field name="description" colspan="4"/>
<separator colspan="4"/>
<group colspan="4" col="2">
<button icon="gtk-cancel" string="Cancel" special="cancel"/>
<button string="Continue" name="inter_call" type="object" icon="gtk-ok"/>
<form string="Module Recording" version="7.0">
<header>
<button string="Continue" name="inter_call" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="Module Information">
<field name="name"/>
<field name="directory_name"/>
<field name="version"/>
<field name="author"/>
<field name="website" colspan="4"/>
<field name="category" colspan="4"/>
<field name="data_kind"/>
</group>
<separator string="Description"/>
<field name="description"/>
</form>
</field>
</record>
@ -116,11 +113,6 @@
<field name="arch" type="xml">
<form string="Module Recording">
<label string="Thanks For using Module Recorder" colspan="4" align="0.0"/>
<separator string="" colspan="4"/>
<group colspan="4" col="2">
<label string=""/>
<button icon="gtk-ok" string="OK" special="cancel"/>
</group>
</form>
</field>
</record>
@ -134,11 +126,6 @@
<separator string="YAML file successfully created !" colspan="4"/>
<newline/>
<field name="yaml_file" filename="module_filename"/>
<separator colspan="4"/>
<group colspan="4" col="2">
<label string=""/>
<button icon="gtk-close" string="Close" special="cancel"/>
</group>
</form>
</field>
</record>

21
addons/base_module_record/wizard/base_module_save_view.xml
View File

@ -7,16 +7,17 @@
<field name="model">base.module.save</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Module Recording">
<separator string="Recording Information" colspan="4"/>
<field name="info_status"/>
<field name="info_text" colspan="4" nolabel="1"/>
<field name="info_yaml" colspan="4"/>
<separator colspan="4"/>
<group colspan="4" col="2">
<button icon="gtk-cancel" string="Cancel" special="cancel"/>
<button name="record_save" icon="gtk-ok" string="Continue" type="object"/>
</group>
<form string="Module Recording" version="7.0">
<header>
<button name="record_save" string="Continue" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="Recording Information">
<field name="info_status"/>
<field name="info_text"/>
<field name="info_yaml"/>
</group>
</form>
</field>
</record>

9
addons/base_report_designer/base_report_designer_installer.xml
View File

@ -8,19 +8,16 @@
<field name="inherit_id" ref="base.res_config_installer"/>
<field name="arch" type="xml">
<data>
<form position="attributes">
<form position="attributes" version="7.0">
<attribute name="string">OpenERP Report Designer Configuration</attribute>
</form>
<separator string="title" position="before">
<label string="This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer."/>
</separator>
<xpath expr="//button[@string='Install Modules']" position="replace">
<button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
<button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
</xpath>
<xpath expr="//button[@string='Cancel']" position="replace">
<button name="action_skip" icon="gtk-jump-to" special="cancel" type="object" string="Cancel" colspan="1" invisible="context.get('menu',False)"/>
<button name="action_next" icon="gtk-go-forward" type="object" string="Configure" invisible="context.get('menu',False)" class="oe_highlight"/>
</xpath>
<xpath expr="//separator[@string='title']" position="after">
<group colspan="8" height="450" width="750">
<field name="name" invisible="1"/>

33
addons/base_report_designer/wizard/base_report_design_view.xml
View File

@ -1,19 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_base_report_sxw" model="ir.ui.view">
<field name="name">Base Report sxw</field>
<field name="model">base.report.sxw</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Get a report">
<separator string="Select your report" colspan="4"/>
<field name="report_id"/>
<separator string="" colspan="4"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="get_report" string="Continue" type="object" icon="gtk-ok"/>
<form string="Get a report" version="7.0">
<header>
<button name="get_report" string="Continue" type="object" class="oe_highlight"/>
<button name="upload_report" string="Upload the modified report" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group string="Select your report">
<field name="report_id"/>
</group>
</form>
</field>
</record>
@ -41,10 +43,6 @@
<field name="file_sxw_upload"/>
<newline/>
<label colspan="4" string="This is the template of your requested report.&#10;Save it as a .SXW file and open it with OpenOffice.&#10;Don't forget to install the OpenERP SA OpenOffice package to modify it.&#10;Once it is modified, re-upload it in OpenERP using this wizard." align="0.0"/>
<separator string="" colspan="4"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="upload_report" string="Upload the modified report" type="object" icon="gtk-go-forward"/>
</form>
</field>
</record>
@ -53,13 +51,10 @@
<field name="model">base.report.rml.save</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Save RML FIle">
<separator string="The RML Report" colspan="4"/>
<field name="file_rml"/>
<newline/>
<separator string="" colspan="4"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
</form>
<form string="Save RML FIle">
<separator string="The RML Report"/>
<field name="file_rml"/>
</form>
</field>
</record>

10
addons/base_setup/res_config_view.xml
View File

@ -8,8 +8,9 @@
<field name="arch" type="xml">
<form string="General Settings" version="7.0">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
<button string="Cancel" type="object" name="cancel"/>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<sheet>
<group string="Company Settings">
@ -55,8 +56,9 @@
<field name="arch" type="xml">
<form string="Configure Sales" version="7.0">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
<button string="Cancel" type="object" name="cancel"/>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<sheet>
<field name="module_crm" invisible="1"/>

5
addons/board/wizard/board_menu_create_view.xml
View File

@ -11,8 +11,9 @@
<field name="arch" type="xml">
<form string="Create Menu For Dashboard" version="7.0">
<header>
<button icon="gtk-save" string="Create Menu" name="board_menu_create" type="object" />
<button icon="gtk-cancel" special="cancel" string="Cancel" />
<button string="Create Menu" name="board_menu_create" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group colspan="4" string="Menu Information">
<field name="menu_name"/>

31
addons/caldav/wizard/caldav_browse_view.xml
View File

@ -13,11 +13,6 @@
<field name="url" colspan="4" />
<separator string="Description" colspan="4"/>
<field name="description" colspan="4" nolabel="1"/>
<separator colspan="4"/>
<group col="4" colspan="4">
<label string="" colspan="2"/>
<button special="cancel" string="_Close" icon="gtk-close"/>
</group>
</group>
</form>
</field>
@ -28,18 +23,18 @@
<field name="model">user.preference</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Caldav's host name configuration">
<form string="Caldav's host name configuration" version="7.0">
<header>
<button name="next_window" string="Next" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<label string="Configure your openerp hostname. For example : " colspan="4"></label>
<newline/>
<label string="database.my.openerp.com or companyserver.com" colspan="4"/>
<newline/>
<separator colspan="4"/>
<field name="host_name" colspan="4" width="250" />
<separator colspan="4"/>
<group col="4" colspan="4">
<button special="cancel" string="_Cancel" icon="gtk-cancel"/>
<button name="next_window" string="Next" type="object" icon="gtk-go-forward"/>
</group>
</form>
</field>
</record>
@ -49,19 +44,17 @@
<field name="model">user.preference</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="User Preference">
<form string="User Preference" version="7.0">
<header>
<button name="open_window" string="_Open" type="object" icon="gtk-ok" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<separator string="" colspan="4"/>
<field name="service" colspan="4" width="250" readonly="1"/>
<field name="collection" colspan="4" width="250" invisible="1" />
<field name="calendar" colspan="4" width="250" domain="[('collection_id','=', collection)]" readonly="1"/>
<field name="device" colspan="4" width="250" />
<separator colspan="4"/>
<group col="4" colspan="4">
<label string="" colspan="2"/>
<button special="cancel" string="_Cancel" icon="gtk-cancel"/>
<button name="open_window" string="_Open" type="object" icon="gtk-ok"/>
</group>
</form>
</field>
</record>

5
addons/caldav/wizard/calendar_event_export_view.xml
View File

@ -11,11 +11,6 @@
<field name="name"/>
<field name="file_path" colspan="4" width="300"/>
</group>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<label string=""/>
<button icon="gtk-close" special="cancel" string="_Close"/>
</group>
</form>
</field>
</record>

17
addons/caldav/wizard/calendar_event_import_view.xml
View File

@ -6,16 +6,16 @@
<field name="model">calendar.event.import</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Import ICS">
<form string="Import ICS" version="7.0">
<header>
<button name="process_imp_ics" string="_Import" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group colspan="4" >
<separator string="Select ICS File"/>
<field name="file_path" colspan="4" width="500" nolabel="1"/>
</group>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="_Cancel"/>
<button icon="gtk-ok" name="process_imp_ics" string="_Import" type="object"/>
</group>
</form>
</field>
</record>
@ -29,10 +29,6 @@
<group colspan="4" >
<field name="msg" colspan="4" width="300" nolabel="1"/>
</group>
<separator string="" colspan="4" />
<group colspan="4">
<button icon="gtk-ok" special="cancel" string="Ok"/>
</group>
</form>
</field>
</record>
@ -42,6 +38,5 @@
res_model="calendar.event.import" src_model="basic.calendar"
view_id="view_calendar_event_import"
view_mode="form" target="new" view_type="form" />
</data>
</openerp>

16
addons/caldav/wizard/calendar_event_subscribe_view.xml
View File

@ -6,16 +6,16 @@
<field name="model">calendar.event.subscribe</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Subscribe to Remote Calendar">
<form string="Subscribe to Remote Calendar" version="7.0">
<header>
<button name="process_imp_ics" string="_Subscribe" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
</header>
<group colspan="4" >
<separator string="Provide Path for Remote Calendar"/>
<field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/>
</group>
<separator string="" colspan="4" />
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="_Cancel"/>
<button icon="gtk-ok" name="process_imp_ics" string="_Subscribe" type="object"/>
</group>
</form>
</field>
</record>
@ -29,10 +29,6 @@
<group colspan="4" >
<field name="msg" colspan="4" width="300" nolabel="1"/>
</group>
<separator string="" colspan="4" />
<group colspan="4">
<button icon="gtk-ok" special="cancel" string="Ok"/>
</group>
</form>
</field>
</record>

16
addons/crm/crm_lead.py
View File

@ -40,7 +40,7 @@ class crm_lead(base_stage, osv.osv):
_name = "crm.lead"
_description = "Lead/Opportunity"
_order = "priority,date_action,id desc"
_inherit = ['ir.needaction_mixin', 'mail.thread','res.partner']
_inherit = ['ir.needaction_mixin', 'mail.thread']
def _get_default_section_id(self, cr, uid, context=None):
""" Gives default section by checking if present in the context """
@ -245,6 +245,20 @@ class crm_lead(base_stage, osv.osv):
'company_currency': fields.related('company_id', 'currency_id', 'symbol', type='char', string='Company Currency', readonly=True),
'user_email': fields.related('user_id', 'user_email', type='char', string='User Email', readonly=True),
'user_login': fields.related('user_id', 'login', type='char', string='User Login', readonly=True),
# Fields for address, due to separation from crm and res.partner
'street': fields.char('Street', size=128),
'street2': fields.char('Street2', size=128),
'zip': fields.char('Zip', change_default=True, size=24),
'city': fields.char('City', size=128),
'state_id': fields.many2one("res.country.state", 'State', domain="[('country_id','=',country_id)]"),
'country_id': fields.many2one('res.country', 'Country'),
'phone': fields.char('Phone', size=64),
'fax': fields.char('Fax', size=64),
'mobile': fields.char('Mobile', size=64),
'function': fields.char('Function', size=128),
'title': fields.many2one('res.partner.title', 'Title'),
'company_id': fields.many2one('res.company', 'Company', select=1),
}
_defaults = {

16
addons/crm/crm_lead_view.xml
View File

@ -83,8 +83,8 @@
<form string="Leads Form" version="7.0">
<header>
<button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
states="draft,open,pending" help="Convert to Opportunity"/>
<button name="case_escalate" string="Escalate" type="object"
states="draft,open,pending" help="Convert to Opportunity" class="oe_highlight"/>
<button name="case_escalate" string="Escalate" type="object"
states="draft,open,pending"/>
<button name="case_reset" string="Reset" type="object"
states="cancel"/>
@ -396,15 +396,17 @@
<button name="stage_next" string="Next" type="object"
states="open" icon="gtk-go-forward" context="{'stage_type': 'opportunity'}"/>
<button name="case_mark_won" string="Mark Won" type="object"
states="draft,open,pending"/>
<button name="case_open" string="Open" type="object"
states="open" class="oe_highlight"/>
<button name="case_mark_won" string="Mark Won" type="object"
states="draft,pending"/>
<button name="case_open" string="Open" type="object" class="oe_highlight"
states="draft,pending"/>
<button name="case_escalate" string="Escalate" type="object"
states="open"/>
states="open" />
<button name="case_mark_lost" string="Mark Lost" type="object"
states="draft,open"/>
<button name="case_reset" string="Reset to Draft" type="object"
states="done,cancel"/>
states="done,cancel" />
<button name="case_cancel" string="Cancel" type="object"
states="draft"/>
<field name="stage_id" widget="statusbar"
@ -590,7 +592,7 @@
help="Opportunities that are assigned to either me or one of the sale teams I manage" />
<separator orientation="vertical"/>
<field name="user_id"/>
<field name="country"/>
<field name="country_id"/>
<field name="partner_id"/>
<field name="section_id"
context="{'invisible_section': False, 'default_section_id': self}"/>

2
addons/crm/crm_meeting_menu.xml
View File

@ -6,7 +6,7 @@
name="Schedule a Meeting"
res_model="crm.meeting"
view_mode="calendar,tree,form,gantt"
context="{'search_default_partner_id': active_id, 'default_duration': 4.0}"
context="{'default_partner_id': active_id, 'default_duration': 4.0}"
/>
<record model="ir.actions.act_window.view" id="action_crm_tag_calendar_meet_partner">

6
addons/crm/crm_meeting_view.xml
View File

@ -27,11 +27,11 @@
<field name="arch" type="xml">
<form string="Meetings" version="7.0">
<header>
<button name="case_open" string="Confirm" type="object"
<button name="case_open" string="Confirm" type="object" class="oe_highlight"
states="draft"/>
<button name="case_close" string="Done" type="object"
<button name="case_close" string="Done" type="object" class="oe_highlight"
states="open"/>
<button name="case_reset" string="Reset to Unconfirmed" type="object"
<button name="case_reset" string="Reset to Unconfirmed" type="object"
states="cancel,done"/>
<button name="case_cancel" string="Cancel" type="object"
states="draft,open"/>

16
addons/crm/crm_phonecall_view.xml
View File

@ -64,21 +64,21 @@
<field name="arch" type="xml">
<form version="7.0">
<header>
<button name="case_open" string="Confirm" type="object"
<button name="case_open" string="Confirm" type="object" class="oe_highlight"
states="draft,pending"/>
<button name="case_close" string="Held" type="object"
<button name="case_close" string="Held" type="object" class="oe_highlight"
states="open,pending"/>
<button name="case_reset" string="Reset to Todo" type="object"
states="cancel"/>
<button name="case_cancel" string="Cancel" type="object"
states="draft,open,pending"/>
<button string="Convert to Opportunity"
name="%(phonecall2opportunity_act)d"
type="action"
attrs="{'invisible':[('opportunity_id','!=',False)]}" />
<button string="Convert to Opportunity" class="oe_highlight"
name="%(phonecall2opportunity_act)d"
type="action"
attrs="{'invisible':[('opportunity_id','!=',False)]}" />
<button string="Schedule Other Call"
name="%(phonecall_to_phonecall_act)d"
type="action" />
name="%(phonecall_to_phonecall_act)d"
type="action" />
<button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done"/>
</header>

11
addons/crm/res_partner_view.xml
View File

@ -76,10 +76,10 @@
</field>
<xpath expr="//h4[@class='oe_partner_heading']" position="after">
<a name="%(act_res_partner_2_opportunity)d" type="action">
<t t-if="record.opportunity_count.value">Opportunities(<t t-esc="record.opportunity_count.value"/>)</t>
<t t-if="record.opportunity_count.value"><t t-esc="record.opportunity_count.value"/> Opportunities</t>
</a>
<a name="%(crm_meeting_partner)d" type="action">
<t t-if="record.meeting_count.value">Meetings(<t t-esc="record.meeting_count.value"/>)</t>
<t t-if="record.meeting_count.value"><t t-esc="record.meeting_count.value"/> Meetings</t>
</a>
</xpath>
</field>
@ -96,11 +96,12 @@
<button type="action"
string="Schedule a Meeting"
name="%(crm.crm_case_categ_meet_create_partner)d"
context="{'search_default_partner_id': [active_id], 'default_duration': 4.0}"/>
context="{'default_partner_id': [active_id], 'default_duration': 4.0}"/>
<button type="action" string="Schedule a Call"
name="%(crm.crm_case_categ_phone_create_partner)d"
context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}" />
<button type="action" string="Create an Opportunity"
context="{'search_default_partner_id': [active_id], 'default_duration': 1.0}" />
<button type="action" string="Opportunities"
context="{'search_default_partner_id': [active_id]}"
name="%(crm.action_view_crm_partner2opportunity)d" />
</xpath>
</field>

11
addons/crm/wizard/crm_add_note_view.xml
View File

@ -11,11 +11,14 @@
<field name="arch" type="xml">
<form string="Add Note" version="7.0">
<header>
<button name="action_add" type="object" string="_Add" icon="gtk-ok" />
<button string="_Cancel" icon="gtk-close" special="cancel" />
<button name="action_add" type="object" string="_Add" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<separator string="Add Note"/>
<field name="body"/>
<group>
<separator string="Add Note"/>
<field name="body"/>
</group>
</form>
</field>
</record>

114
addons/crm/wizard/crm_lead_to_opportunity_view.xml
View File

@ -1,67 +1,61 @@
<openerp>
<data>
<data>
<record id="view_crm_lead2opportunity_partner" model="ir.ui.view">
<field name="name">crm.lead2opportunity.partner.form</field>
<field name="model">crm.lead2opportunity.partner</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Convert to Opportunity">
<field name="action"/>
<group attrs="{'invisible':[('action','!=','exist')]}">
<field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
</group>
<separator string="Convert to Opportunity" colspan="4"/>
<field name="name">crm.lead2opportunity.partner.form</field>
<field name="model">crm.lead2opportunity.partner</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Convert to Opportunity" version="7.0">
<header>
<button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<field name="action"/>
<group attrs="{'invisible':[('action','!=','exist')]}">
<field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
</group>
<group string="Convert to Opportunity">
<field name="name" colspan="4"/>
<group col="4" colspan="4" attrs="{'invisible': [('name', '=', 'convert')]}" >
<separator string="Select Opportunities" colspan="4" />
</group>
<field name="opportunity_ids" colspan="4" nolabel="1" attrs="{'invisible': [('name', '=', 'convert')]}">
<tree>
<field name="name" />
<field name="partner_id" />
<field name="user_id" />
<field name="section_id" />
</tree>
</field>
<separator string="" colspan="4" />
<group col="4" colspan="4">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="action_apply" string="Create Opportunity" type="object" icon="gtk-ok"/>
</group>
</form>
</field>
</record>
</group>
<separator string="Select Opportunities" attrs="{'invisible': [('name', '=', 'convert')]}"/>
<field name="opportunity_ids" attrs="{'invisible': [('name', '=', 'convert')]}">
<tree>
<field name="name" />
<field name="partner_id" />
<field name="user_id" />
<field name="section_id" />
</tree>
</field>
</form>
</field>
</record>
<record id="view_crm_lead2opportunity_partner_mass" model="ir.ui.view">
<field name="name">crm.lead2opportunity.partner.mass.form</field>
<field name="model">crm.lead2opportunity.partner.mass</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Convert to Opportunity">
<field name="action"/>
<field name="name" colspan="4"/>
<separator string="Assigned Opportunities to" colspan="4" />
<field name="section_id" />
<group col="4" colspan="4">
<separator string="Select Salesman" colspan="4" />
</group>
<field name="user_ids" nolabel="1" colspan="4">
<tree>
<field name="name" />
</tree>
</field>
<separator string="" colspan="4" />
<group col="4" colspan="4">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="mass_convert" string="Convert into Opportunities" type="object" icon="gtk-ok"/>
</group>
</form>
</field>
</record>
<field name="name">crm.lead2opportunity.partner.mass.form</field>
<field name="model">crm.lead2opportunity.partner.mass</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Convert to Opportunity" version="7.0">
<header>
<button name="mass_convert" string="Convert into Opportunities" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<field name="action"/>
<field name="name" colspan="4"/>
<group string="Assigned Opportunities to">
<field name="section_id" />
</group>
<separator string="Select Salesman"/>
<field name="user_ids">
<tree>
<field name="name" />
</tree>
</field>
</form>
</field>
</record>
<record id="action_crm_lead2opportunity_partner" model="ir.actions.act_window">
<field name="name">Create a Partner</field>
@ -79,5 +73,5 @@
view_mode="form" target="new" view_type="form"
context="{'mass_convert' : True}"
view_id="view_crm_lead2opportunity_partner_mass"/>
</data>
</data>
</openerp>

7
addons/crm/wizard/crm_lead_to_partner_view.xml
View File

@ -10,11 +10,12 @@
<field name="arch" type="xml">
<form string="Create a Partner" version="7.0">
<header>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
<button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<separator string="Create a Partner"/>
<group col="4">
<separator string="Create a Partner"/>
<field name="action"/>
<field name="partner_id" attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"/>
</group>

5
addons/crm/wizard/crm_merge_opportunities_view.xml
View File

@ -11,8 +11,9 @@
<field name="arch" type="xml">
<form string="Merge Opportunities" version="7.0">
<header>
<button name="action_merge" type="object" string="_Merge" icon="gtk-ok" />
<button string="_Cancel" icon="gtk-cancel" special="cancel" />
<button name="action_merge" type="object" string="_Merge" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<separator string="Select Opportunities"/>
<field name="opportunity_ids">

6
addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
View File

@ -11,10 +11,10 @@
<field name="arch" type="xml">
<form string="Schedule/Log a Call" version="7.0">
<header>
<button name="action_schedule" type="object" string="Log call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
<button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
<button name="action_schedule" type="object" string="Log call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
<button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight" />
or
<button name="action_cancel" string="_Cancel" class="oe_link" special="cancel" />
<button name="action_cancel" string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<group>

7
addons/crm/wizard/crm_partner_to_opportunity_view.xml
View File

@ -10,8 +10,9 @@
<field name="arch" type="xml">
<form string="Create Opportunity" version="7.0">
<header>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="make_opportunity" string="Create Opportunity" type="object" icon="gtk-ok"/>
<button name="make_opportunity" string="Create Opportunity" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group col="4">
<field name="name"/>
@ -29,7 +30,7 @@
<field name="name">Create Opportunity</field>
<field name="res_model">crm.partner2opportunity</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_mode">form,tree,kanban,calendar</field>
<field name="target">new</field>
</record>

8
addons/crm/wizard/crm_phonecall_to_meeting_view.xml
View File

@ -10,12 +10,12 @@
<field name="model">crm.phonecall2meeting</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Convert To Meeting">
<form string="Convert To Meeting" version="7.0">
<header>
<button name="action_cancel" string="_Cancel"
icon="gtk-cancel" special="cancel" />
<button name="action_make_meeting" type="object"
string="_Schedule" icon="gtk-go-forward" />
string="_Schedule" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<label string="Are you sure to schedule a Meeting for this Phonecall?"/>
</form>

5
addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
View File

@ -11,8 +11,9 @@
<field name="arch" type="xml">
<form string="Convert To Opportunity " version="7.0">
<header>
<button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
<button name="make_opportunity" type="object" string="_Convert" icon="gtk-convert" />
<button name="make_opportunity" type="object" string="_Convert" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group col="4">
<field name="name"/>

13
addons/crm/wizard/crm_phonecall_to_partner_view.xml
View File

@ -10,10 +10,12 @@
<field name="arch" type="xml">
<form string="Create a Partner" version="7.0">
<header>
<button name="open_create_partner" string="Create Partner" type="object" icon="gtk-ok" groups="base.group_partner_manager"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="open_create_partner" string="Create Partner" type="object" groups="base.group_partner_manager" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<label string="Are you sure you want to create a partner based on this Phonecall ?"/>
<newline/>
<label string="You may have to verify that this partner does not exist already."/>
</form>
</field>
@ -28,8 +30,9 @@
<field name="arch" type="xml">
<form string="Create a Partner" version="7.0">
<header>
<button name="make_partner" string="Continue" type="object" icon="gtk-ok"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="make_partner" string="Continue" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group>
<field name="action"/>
@ -49,7 +52,5 @@
<field name="view_id" ref="view_crm_phonecall2partner_create"/>
<field name="target">new</field>
</record>
</data>
</openerp>

7
addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
View File

@ -11,9 +11,10 @@
<field name="arch" type="xml">
<form string="Schedule/Log a Call" version="7.0">
<header>
<button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" />
<button name="action_schedule" type="object" string="Log Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'log')]}" />
<button name="action_schedule" type="object" string="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
<button name="action_schedule" type="object" string="Log Call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
<button name="action_schedule" type="object" string="Schedule Call" attrs="{'invisible' : [('action', '!=', 'schedule')]}" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
</header>
<group col="4">
<separator string="Schedule/Log a Call" colspan="4"/>

12
addons/crm_claim/crm_claim_view.xml
View File

@ -91,19 +91,19 @@
<form version="7.0">
<header>
<span groups="base.group_user">
<button name="case_open" string="Open" type="object"
states="draft,pending"/>
<button name="case_close" string="Done" type="object"
<button name="case_open" string="Open" type="object" class="oe_highlight"
states="draft,pending" />
<button name="case_close" string="Done" type="object" class="oe_highlight"
states="open,pending"/>
<button name="case_refuse" string="Refuse" type="object"
<button name="case_refuse" string="Refuse" type="object" class="oe_highlight"
states="draft,open,pending"/>
<button name="stage_previous" string="Previous Stage" type="object"
states="open,pending" icon="gtk-go-back" attrs="{'invisible': [('stage_id','=', False)]}"/>
<button name="stage_next" string="Next Stage" type="object"
states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
<button name="case_reset" string="Reset to Draft" type="object"
<button name="case_reset" string="Reset to Draft" type="object"
states="cancel,done"/>
<button name="case_cancel" string="Cancel" type="object"
<button name="case_cancel" string="Cancel" type="object"
states="draft,open,pending"/>
</span>
<field name="stage_id" widget="statusbar"

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