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

[IMP]all: Improve all typos 

bzr revid: mma@tinyerp.com-20120424060532-ohrf0sxwq8rpq6ls
This commit is contained in:
Mayur Maheshwari (OpenERP) 2012-04-24 11:35:32 +05:30
parent cfeb2b9ebf
commit 9e59ce8812
96 changed files with 136 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account_installer.xml
View File

@ -10,7 +10,7 @@
<form position="attributes"> <form position="attributes">
<attribute name="string">Accounting Application Configuration</attribute> <attribute name="string">Accounting Application Configuration</attribute>
</form> </form>
<separator string="title" position="attributes"> <separator string="Title" position="attributes">
<attribute name="string">Configure Your Chart of Accounts</attribute> <attribute name="string">Configure Your Chart of Accounts</attribute>
</separator> </separator>
<xpath expr="//label[@string='description']" position="attributes"> <xpath expr="//label[@string='description']" position="attributes">

2
addons/account/account_invoice_view.xml
View File

@ -99,7 +99,7 @@
<field name="manual"/> <field name="manual"/>
<field name="amount"/> <field name="amount"/>
<field name="base" readonly="0"/> <field name="base" readonly="0"/>
<separator colspan="4" string="Tax codes"/> <separator colspan="4" string="Tax Codes"/>
<field name="base_code_id"/> <field name="base_code_id"/>
<field name="base_amount"/> <field name="base_amount"/>
<field name="tax_code_id"/> <field name="tax_code_id"/>

8
addons/account/account_view.xml
View File

@ -1808,7 +1808,7 @@
<separator colspan="4" string="Information"/> <separator colspan="4" string="Information"/>
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="active" select="1"/> <field name="active" select="1"/>
<separator colspan="4" string="Description On Invoices"/> <separator colspan="4" string="Description on Invoices"/>
<field colspan="4" name="note" nolabel="1"/> <field colspan="4" name="note" nolabel="1"/>
<separator colspan="4" string="Computation"/> <separator colspan="4" string="Computation"/>
<field colspan="4" name="line_ids" nolabel="1"/> <field colspan="4" name="line_ids" nolabel="1"/>
@ -2058,7 +2058,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Create Account"> <form string="Create Account">
<separator col="4" colspan="4" string="Create an Account based on this template"/> <separator col="4" colspan="4" string="Create an Account Based on this Template"/>
<field name="cparent_id"/> <field name="cparent_id"/>
<newline/> <newline/>
<group col="2" colspan="2"> <group col="2" colspan="2">
@ -2114,7 +2114,7 @@
<field name="currency_id"/> <field name="currency_id"/>
<field name="reconcile"/> <field name="reconcile"/>
<field name="chart_template_id"/> <field name="chart_template_id"/>
<separator string="Default taxes" colspan="4"/> <separator string="Default Taxes" colspan="4"/>
<field name="tax_ids" colspan="4" nolabel="1"/> <field name="tax_ids" colspan="4" nolabel="1"/>
</page> </page>
<page string="Notes"> <page string="Notes">
@ -2308,7 +2308,7 @@
<page groups="base.group_extended" string="Special Computation"> <page groups="base.group_extended" string="Special Computation">
<separator colspan="4" string="Compute Code (if type=code)"/> <separator colspan="4" string="Compute Code (if type=code)"/>
<field colspan="4" name="python_compute" nolabel="1" attrs="{'readonly':[('type','!=','code')]}"/> <field colspan="4" name="python_compute" nolabel="1" attrs="{'readonly':[('type','!=','code')]}"/>
<separator colspan="4" string="Compute Code for Taxes included prices"/> <separator colspan="4" string="Compute Code for Taxes Included Prices"/>
<field colspan="4" name="python_compute_inv" nolabel="1"/> <field colspan="4" name="python_compute_inv" nolabel="1"/>
<separator colspan="4" string="Applicable Code (if type=code)"/> <separator colspan="4" string="Applicable Code (if type=code)"/>
<field colspan="4" name="python_applicable" nolabel="1" attrs="{'readonly':[('applicable_type','=','true')]}"/> <field colspan="4" name="python_applicable" nolabel="1" attrs="{'readonly':[('applicable_type','=','true')]}"/>

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

@ -8,7 +8,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select period"> <form string="Select period">
<separator string="Cost Ledger for period" colspan="4"/> <separator string="Cost Ledger for Period" colspan="4"/>
<field name="date1"/> <field name="date1"/>
<field name="date2"/> <field name="date2"/>
<separator string="and Journals" colspan="4"/> <separator string="and Journals" colspan="4"/>

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

@ -47,7 +47,7 @@
<filter icon="terp-go-month" string="Month-1" <filter icon="terp-go-month" string="Month-1"
domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]" domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
help="last month"/> help="last month"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter icon="terp-go-year" string=" 365 Days " <filter icon="terp-go-year" string=" 365 Days "
domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]" domain="[('day','&lt;=', time.strftime('%%Y-%%m-%%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Analytic Entries of last 365 days"/> help="Analytic Entries of last 365 days"/>

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

@ -9,7 +9,7 @@
<field name="model">report.account.receivable</field> <field name="model">report.account.receivable</field>
<field name="type">graph</field> <field name="type">graph</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<graph string="Accounts by type" type="bar"> <graph string="Accounts by Type" type="bar">
<field name="name"/> <field name="name"/>
<field name="balance" operator="+"/> <field name="balance" operator="+"/>
</graph> </graph>
@ -20,7 +20,7 @@
<field name="model">report.account.receivable</field> <field name="model">report.account.receivable</field>
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Accounts by type"> <tree string="Accounts by Type">
<field name="name"/> <field name="name"/>
<field name="type"/> <field name="type"/>
<field name="balance"/> <field name="balance"/>
@ -34,7 +34,7 @@
<field name="model">report.account.receivable</field> <field name="model">report.account.receivable</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Accounts by type"> <form string="Accounts by Type">
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="type" select="1"/> <field name="type" select="1"/>
</form> </form>
@ -171,7 +171,7 @@
<field name="model">report.account_type.sales</field> <field name="model">report.account_type.sales</field>
<field name="type">tree</field> <field name="type">tree</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Sales by Account type"> <tree string="Sales by Account Type">
<field name="name"/> <field name="name"/>
<field name="month"/> <field name="month"/>
<field name="period_id"/> <field name="period_id"/>
@ -189,7 +189,7 @@
<field name="model">report.account_type.sales</field> <field name="model">report.account_type.sales</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<tree string="Sales by Account type"> <tree string="Sales by Account Type">
<field name="name" select="1"/> <field name="name" select="1"/>
<field name="month" select="1"/> <field name="month" select="1"/>
<field name="product_id" select="1"/> <field name="product_id" select="1"/>

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

@ -57,7 +57,7 @@
<field name="model">account.automatic.reconcile</field> <field name="model">account.automatic.reconcile</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Reconciliation result"> <form string="Reconciliation Result">
<field name="reconciled"/> <field name="reconciled"/>
<newline/> <newline/>
<field name="unreconciled"/> <field name="unreconciled"/>

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

@ -14,7 +14,7 @@
<group colspan="4" col="6"> <group colspan="4" col="6">
<label string ="" colspan="2"/> <label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="terp-gtk-go-back-rtl" string="Open for bank reconciliation" name="action_open_window" type="object"/> <button icon="terp-gtk-go-back-rtl" string="Open for Bank Reconciliation" name="action_open_window" type="object"/>
</group> </group>
</form> </form>
</field> </field>

2
addons/account/wizard/account_move_journal_view.xml
View File

@ -7,7 +7,7 @@
<field name="model">account.move.journal</field> <field name="model">account.move.journal</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Standard entries"> <form string="Standard Entries">
<field name="target_move"/> <field name="target_move"/>
</form> </form>
</field> </field>

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

@ -14,7 +14,7 @@
<group colspan="4" col="6"> <group colspan="4" col="6">
<label string ="" colspan="2"/> <label string ="" colspan="2"/>
<button icon="gtk-cancel" special="cancel" string="Cancel" /> <button icon="gtk-cancel" special="cancel" string="Cancel" />
<button icon="terp-gtk-go-back-rtl" string="Open For Unreconciliation" name="action_open_window" type="object" /> <button icon="terp-gtk-go-back-rtl" string="Open for Unreconciliation" name="action_open_window" type="object" />
</group> </group>
</form> </form>
</field> </field>

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

@ -9,7 +9,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Close Period"> <form string="Close Period">
<group colspan="4" > <group colspan="4" >
<separator string="Are you sure ?" colspan="4"/> <separator string="Are you sure?" colspan="4"/>
<field name="sure"/> <field name="sure"/>
</group> </group>
<separator string="" colspan="4" /> <separator string="" colspan="4" />

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

@ -15,7 +15,7 @@
<newline/> <newline/>
<group colspan="4" col="4"> <group colspan="4" col="4">
<button special="cancel" string="Cancel" icon="gtk-cancel"/> <button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to next partner" /> <button name="next_partner" icon="terp-gtk-jump-to-ltr" type="object" string="Go to Next Partner" />
</group> </group>
</form> </form>
</field> </field>

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

@ -8,7 +8,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Reconciliation"> <form string="Reconciliation">
<separator string="Reconciliation transactions" colspan="4"/> <separator string="Reconciliation Transactions" colspan="4"/>
<field name="trans_nbr"/> <field name="trans_nbr"/>
<newline/> <newline/>
<field name="credit"/> <field name="credit"/>

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

@ -8,7 +8,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Unreconciliation"> <form string="Unreconciliation">
<separator string="Unreconciliate transactions" colspan="4"/> <separator string="Unreconciliate Transactions" colspan="4"/>
<image name="terp-referer"/> <image name="terp-referer"/>
<label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled" colspan="2"/> <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled" colspan="2"/>
<separator colspan="4"/> <separator colspan="4"/>
@ -44,7 +44,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Unreconciliation"> <form string="Unreconciliation">
<separator string="Unreconciliation transactions" colspan="4"/> <separator string="Unreconciliation Transactions" colspan="4"/>
<image name="gtk-dialog-info"/> <image name="gtk-dialog-info"/>
<label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/> <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
<separator colspan="4"/> <separator colspan="4"/>

6
addons/account_analytic_analysis/account_analytic_analysis_view.xml
View File

@ -38,7 +38,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<notebook position="inside"> <notebook position="inside">
<page string="Invoice Analysis"> <page string="Invoice Analysis">
<separator colspan="4" string="Work done stats"/> <separator colspan="4" string="Work Done Stats"/>
<field name="total_cost"/> <field name="total_cost"/>
<field name="remaining_ca"/> <field name="remaining_ca"/>
@ -49,13 +49,13 @@
<field name="hours_qtt_invoiced"/> <field name="hours_qtt_invoiced"/>
<field name="remaining_hours"/> <field name="remaining_hours"/>
<newline/> <newline/>
<separator colspan="4" string="Analysis stats"/> <separator colspan="4" string="Analysis Stats"/>
<field name="revenue_per_hour"/> <field name="revenue_per_hour"/>
<field name="real_margin"/> <field name="real_margin"/>
<field name="real_margin_rate"/> <field name="real_margin_rate"/>
<field name="theorical_margin"/> <field name="theorical_margin"/>
<separator colspan="4" string="Key dates"/> <separator colspan="4" string="Key Dates"/>
<field name="last_invoice_date"/> <field name="last_invoice_date"/>
<field name="last_worked_invoiced_date"/> <field name="last_worked_invoiced_date"/>

4
addons/account_asset/account_asset_view.xml
View File

@ -13,7 +13,7 @@
<form string="Asset category"> <form string="Asset category">
<field name="name"/> <field name="name"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="company_id" widget="selection" groups="base.group_multi_company"/>
<separator string="Accounting information" colspan="4"/> <separator string="Accounting Information" colspan="4"/>
<field name="journal_id"/> <field name="journal_id"/>
<field name="account_asset_id" on_change="onchange_account_asset(account_asset_id)"/> <field name="account_asset_id" on_change="onchange_account_asset(account_asset_id)"/>
<field name="account_depreciation_id"/> <field name="account_depreciation_id"/>
@ -33,7 +33,7 @@
<field name="open_asset"/> <field name="open_asset"/>
</group> </group>
<group col="2" colspan="2" groups="analytic.group_analytic_accounting"> <group col="2" colspan="2" groups="analytic.group_analytic_accounting">
<separator string="Analytic information" colspan="4"/> <separator string="Analytic Information" colspan="4"/>
<newline/> <newline/>
<field name="account_analytic_id"/> <field name="account_analytic_id"/>
</group> </group>

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

@ -9,7 +9,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Modify Asset"> <form string="Modify Asset">
<group colspan="4" col="4"> <group colspan="4" col="4">
<separator string="Asset durations to modify" colspan="4"/> <separator string="Asset Durations to Modify" colspan="4"/>
<field name="name" colspan="4"/> <field name="name" colspan="4"/>
<group colspan="2" col="2"> <group colspan="2" col="2">
<field name="method_number"/> <field name="method_number"/>

2
addons/account_check_writing/account_view.xml
View File

@ -32,7 +32,7 @@
<field name="inherit_id" ref="base.view_company_form"/> <field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<page string="Configuration" position="inside"> <page string="Configuration" position="inside">
<separator string="Default Check layout" colspan="4"/> <separator string="Default Check Layout" colspan="4"/>
<field name="check_layout"/> <field name="check_layout"/>
<newline/> <newline/>
</page> </page>

2
addons/account_coda/account_coda_wizard.xml
View File

@ -10,7 +10,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Import CODA File"> <form string="Import CODA File">
<group col="2"> <group col="2">
<separator string="Select your file :" colspan="4"/> <separator string="Select Your File :" colspan="4"/>
<field name="coda_data" filename="coda_fname"/> <field name="coda_data" filename="coda_fname"/>
<field name="coda_fname"/> <field name="coda_fname"/>
</group> </group>

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

@ -8,7 +8,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Send followups"> <form string="Send followups">
<separator string="Send followups" colspan="4"/> <separator string="Send Follow-Ups" colspan="4"/>
<label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information." colspan="4" nolabel="1"/> <label string ="This feature allows you to send reminders to partners with pending invoices. You can send them the default message for unpaid invoices or manually enter a message should you need to remind them of a specific information." colspan="4" nolabel="1"/>
<group col="4" colspan="6"> <group col="4" colspan="6">
<field name="followup_id"/> <field name="followup_id"/>
@ -87,7 +87,7 @@
<field name="partner_lang" colspan="4"/> <field name="partner_lang" colspan="4"/>
<field name="test_print" colspan="4"/> <field name="test_print" colspan="4"/>
<field name="email_subject" colspan="4"/> <field name="email_subject" colspan="4"/>
<separator string="Email body" colspan="4" /> <separator string="Email Body" colspan="4" />
<field name="email_body" colspan="4" nolabel="1"/> <field name="email_body" colspan="4" nolabel="1"/>
<separator string="Legend" colspan="4"/> <separator string="Legend" colspan="4"/>
<label string="%%(partner_name)s: Partner name" colspan="2"/> <label string="%%(partner_name)s: Partner name" colspan="2"/>

2
addons/account_sequence/account_sequence_installer_view.xml
View File

@ -11,7 +11,7 @@
<form position="attributes"> <form position="attributes">
<attribute name="string">Account Sequence Application Configuration</attribute> <attribute name="string">Account Sequence Application Configuration</attribute>
</form> </form>
<separator string="title" position="attributes"> <separator string="Title" position="attributes">
<attribute name="string">Configure Your Account Sequence Application</attribute> <attribute name="string">Configure Your Account Sequence Application</attribute>
</separator> </separator>
<xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes"> <xpath expr="//separator[@string=&quot;vsep&quot;]" position="attributes">

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

@ -61,7 +61,7 @@
<filter icon="terp-go-month" string="Month-1" <filter icon="terp-go-month" string="Month-1"
domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]" domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
help="last month"/> help="last month"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Draft" <filter string="Draft"
icon="terp-document-new" icon="terp-document-new"
domain="[('state','=','draft')]" domain="[('state','=','draft')]"

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

@ -8,7 +8,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Unreconciliation"> <form string="Unreconciliation">
<separator colspan="4" string="Unreconciliation transactions" /> <separator colspan="4" 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" colspan="2"/> <label string="If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable" colspan="2"/>
<separator colspan="4"/> <separator colspan="4"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/> <button special="cancel" string="Cancel" icon="gtk-cancel"/>

2
addons/auction/wizard/auction_lots_able_view.xml
View File

@ -8,7 +8,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Confirm"> <form string="Confirm">
<group colspan="4" > <group colspan="4" >
<separator string="Confirmation set taken away" colspan="4"/> <separator string="Confirmation Set Taken Away" colspan="4"/>
<newline/> <newline/>
</group> </group>
<separator string="" colspan="4" /> <separator string="" colspan="4" />

2
addons/auction/wizard/auction_lots_enable_view.xml
View File

@ -7,7 +7,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Confirm"> <form string="Confirm">
<separator string="Confirmation Enable Taken away" colspan="4"/> <separator string="Confirmation Enable Taken Away" colspan="4"/>
<group colspan="4" col="6"> <group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/> <button icon="gtk-cancel" special="cancel" string="Cancel"/>
<button icon="gtk-goto-last" string="Enable Taken away" name="confirm_enable" type="object"/> <button icon="gtk-goto-last" string="Enable Taken away" name="confirm_enable" type="object"/>

2
addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml
View File

@ -8,7 +8,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Buyer Invoice"> <form string="Buyer Invoice">
<group colspan="4" > <group colspan="4" >
<separator string="Create Invoices For Buyer" colspan="4"/> <separator string="Create Invoices for Buyer" colspan="4"/>
<field name="amount"/> <field name="amount"/>
<field name="objects"/> <field name="objects"/>
<field name="number"/> <field name="number"/>

2
addons/auction/wizard/auction_lots_make_invoice_view.xml
View File

@ -8,7 +8,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Seller Invoice"> <form string="Seller Invoice">
<group colspan="4" > <group colspan="4" >
<separator string="Create Invoices For Seller" colspan="4"/> <separator string="Create Invoices for Seller" colspan="4"/>
<field name="amount"/> <field name="amount"/>
<field name="objects"/> <field name="objects"/>
<field name="number" colspan="1"/> <field name="number" colspan="1"/>

2
addons/auction/wizard/auction_lots_sms_send_view.xml
View File

@ -8,7 +8,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="SMS - Gateway: clickatell','Bulk SMS send"> <form string="SMS - Gateway: clickatell','Bulk SMS send">
<group colspan="4" > <group colspan="4" >
<separator string="SMS - Gateway: clickatell','Bulk SMS send" colspan="4"/> <separator string="SMS - Gateway: clickatell','Bulk SMS Send" colspan="4"/>
<field name="app_id" colspan="4"/> <field name="app_id" colspan="4"/>
<field name="user"/> <field name="user"/>
<field name="password" password="True"/> <field name="password" password="True"/>

2
addons/auction/wizard/auction_transfer_unsold_object_view.xml
View File

@ -8,7 +8,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Draft To Posted"> <form string="Draft To Posted">
<group col="1" colspan="2"> <group col="1" colspan="2">
<separator colspan="4" string="Transfer unsold Object: Current auction date to another " /> <separator colspan="4" string="Transfer Unsold Object: Current auction date to another " />
</group> </group>
<newline/> <newline/>
<field name="auction_id_from" select="1"/> <field name="auction_id_from" select="1"/>

2
addons/base_action_rule/base_action_rule_view.xml
View File

@ -78,7 +78,7 @@
<separator colspan="4" string="Email Body"/> <separator colspan="4" string="Email Body"/>
<field colspan="4" name="act_mail_body" height="250" <field colspan="4" name="act_mail_body" height="250"
nolabel="1" attrs="{'required':[('act_remind_user','=',True)]}" /> nolabel="1" attrs="{'required':[('act_remind_user','=',True)]}" />
<separator colspan="4" string="Special Keywords to Be Used in The Body"/> <separator colspan="4" string="Special Keywords to be Used in the Body"/>
<label align="0.0" string="%%(object_id)s = Object ID" colspan="2"/> <label align="0.0" string="%%(object_id)s = Object ID" colspan="2"/>
<label align="0.0" string="%%(object_subject)s = Object subject" colspan="2"/> <label align="0.0" string="%%(object_subject)s = Object subject" colspan="2"/>
<label align="0.0" string="%%(object_description)s = Object description" colspan="2"/> <label align="0.0" string="%%(object_description)s = Object description" colspan="2"/>

2
addons/base_calendar/base_calendar_view.xml
View File

@ -351,7 +351,7 @@
<field name="interval" /> <field name="interval" />
<separator string="End of recurrency" colspan="4"/> <separator string="End of Recurrency" colspan="4"/>
<field name="end_type" /> <field name="end_type" />
<label string=" " colspan="2" /> <label string=" " colspan="2" />
<newline /> <newline />

2
addons/base_module_doc_rst/wizard/tech_guide_rst_view.xml
View File

@ -8,7 +8,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Create Technical Guide in rst format"> <form string="Create Technical Guide in rst format">
<separator string="Technical Guide in rst format" colspan="4"/> <separator string="Technical Guide in rst Format" colspan="4"/>
<label string="Please choose a file where the Technical Guide will be written." colspan="4"/> <label string="Please choose a file where the Technical Guide will be written." colspan="4"/>
<field name="rst_file" /> <field name="rst_file" />
</form> </form>

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

@ -60,7 +60,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Module Recording"> <form string="Module Recording">
<separator string="Module successfully created !" colspan="4"/> <separator string="Module successfully created!" colspan="4"/>
<field name="module_filename"/> <field name="module_filename"/>
<newline/> <newline/>
<field name="module_file"/> <field name="module_file"/>

2
addons/base_report_designer/base_report_designer_installer.xml
View File

@ -12,7 +12,7 @@
<form position="attributes"> <form position="attributes">
<attribute name="string">OpenERP Report Designer Configuration</attribute> <attribute name="string">OpenERP Report Designer Configuration</attribute>
</form> </form>
<separator string="title" position="attributes"> <separator string="Title" position="attributes">
<attribute name="string">OpenERP Report Designer</attribute> <attribute name="string">OpenERP Report Designer</attribute>
</separator> </separator>
<xpath expr="//label[@string='description']" position="attributes"> <xpath expr="//label[@string='description']" position="attributes">

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

@ -54,7 +54,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Save RML FIle"> <form string="Save RML FIle">
<separator string="The RML report" colspan="4"/> <separator string="The RML Report" colspan="4"/>
<field name="file_rml"/> <field name="file_rml"/>
<newline/> <newline/>
<separator string="" colspan="4"/> <separator string="" colspan="4"/>

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

@ -9,7 +9,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Browse caldav" > <form string="Browse caldav" >
<group colspan="4" width="700" height="500"> <group colspan="4" width="700" height="500">
<separator string="Browse caldav" colspan="4"/> <separator string="Browse Caldav" colspan="4"/>
<field name="url" colspan="4" /> <field name="url" colspan="4" />
<separator string="Description" colspan="4"/> <separator string="Description" colspan="4"/>
<field name="description" colspan="4" nolabel="1"/> <field name="description" colspan="4" nolabel="1"/>

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

@ -8,7 +8,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Import ICS"> <form string="Import ICS">
<group colspan="4" > <group colspan="4" >
<separator string="Select ICS file"/> <separator string="Select ICS File"/>
<field name="file_path" colspan="4" width="500" nolabel="1"/> <field name="file_path" colspan="4" width="500" nolabel="1"/>
</group> </group>
<separator string="" colspan="4" /> <separator string="" colspan="4" />

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

@ -8,7 +8,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Subscribe to Remote Calendar"> <form string="Subscribe to Remote Calendar">
<group colspan="4" > <group colspan="4" >
<separator string="Provide path for Remote Calendar"/> <separator string="Provide Path for Remote Calendar"/>
<field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/> <field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/>
</group> </group>
<separator string="" colspan="4" /> <separator string="" colspan="4" />

2
addons/crm/crm_meeting_view.xml
View File

@ -166,7 +166,7 @@
<field name="interval" /> <field name="interval" />
<separator string="End of recurrency" colspan="4"/> <separator string="End of Recurrency" colspan="4"/>
<field name="end_type" /> <field name="end_type" />
<label string=" " colspan="2" /> <label string=" " colspan="2" />
<newline /> <newline />

2
addons/crm/crm_view.xml
View File

@ -90,7 +90,7 @@
</group> </group>
</page> </page>
<page string="Stages"> <page string="Stages">
<separator string="Select stages for this Sales Team" colspan="4"/> <separator string="Select Stages for this Sales Team" colspan="4"/>
<field name="stage_ids" colspan="4" nolabel="1"/> <field name="stage_ids" colspan="4" nolabel="1"/>
</page> </page>
<page string="Notes"> <page string="Notes">

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

@ -46,7 +46,7 @@
<field name="action"/> <field name="action"/>
<field name="name" colspan="4"/> <field name="name" colspan="4"/>
<separator string="Assigned opportunities to" colspan="4" /> <separator string="Assigned Opportunities to" colspan="4" />
<field name="section_id" /> <field name="section_id" />
<group col="4" colspan="4"> <group col="4" colspan="4">
<separator string="Select Salesman" colspan="4" /> <separator string="Select Salesman" colspan="4" />

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

@ -10,7 +10,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Schedule/Log a call"> <form string="Schedule/Log a call">
<separator string="Schedule/Log a call" colspan="4"/> <separator string="Schedule/Log a Call" colspan="4"/>
<field name="action"/> <field name="action"/>
<separator string="Call Details" colspan="4"/> <separator string="Call Details" colspan="4"/>
<field name="name"/> <field name="name"/>

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

@ -10,7 +10,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Schedule/Log a call"> <form string="Schedule/Log a call">
<separator string="Schedule/Log a call" colspan="4"/> <separator string="Schedule/Log a Call" colspan="4"/>
<field name="action"/> <field name="action"/>
<separator string="Call Details" colspan="4"/> <separator string="Call Details" colspan="4"/>
<field name="name"/> <field name="name"/>
@ -22,8 +22,8 @@
<separator string=" " colspan="4"/> <separator string=" " colspan="4"/>
<group colspan="4" col="3" > <group colspan="4" col="3" >
<button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" /> <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="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="Schedule Call" icon="gtk-ok" attrs="{'invisible' : [('action', '!=', 'schedule')]}" />
</group> </group>
</form> </form>
</field> </field>

2
addons/crm_profiling/crm_profiling_view.xml
View File

@ -110,7 +110,7 @@
<newline/> <newline/>
<field name="name" select="1" /> <field name="name" select="1" />
<newline/> <newline/>
<separator string="Avalaible answers" colspan="4"/> <separator string="Avalaible Answers" colspan="4"/>
<field name="answers_ids" colspan="4" nolabel="1"> <field name="answers_ids" colspan="4" nolabel="1">
<tree string="Answers" editable="bottom"> <tree string="Answers" editable="bottom">
<field name="name" select="1"/> <field name="name" select="1"/>

2
addons/document/document_view.xml
View File

@ -257,7 +257,7 @@
<group col="2" colspan="2"> <group col="2" colspan="2">
<field name="res_id" invisible="True"/> <field name="res_id" invisible="True"/>
<group col="2" colspan="2" attrs="{'invisible': [('res_id','=',0)]}"> <group col="2" colspan="2" attrs="{'invisible': [('res_id','=',0)]}">
<separator string="Attached To" colspan="2"/> <separator string="Attached to" colspan="2"/>
<field name="res_model" readonly="True" invisible="True"/> <field name="res_model" readonly="True" invisible="True"/>
<field name="res_name" readonly="1"/> <field name="res_name" readonly="1"/>
</group> </group>

2
addons/document/wizard/document_configuration_view.xml
View File

@ -10,7 +10,7 @@
<form position="attributes"> <form position="attributes">
<attribute name="string">Knowledge Application Configuration</attribute> <attribute name="string">Knowledge Application Configuration</attribute>
</form> </form>
<separator string="title" position="attributes"> <separator string="Title" position="attributes">
<attribute name="string">Configure Directories</attribute> <attribute name="string">Configure Directories</attribute>
</separator> </separator>
<xpath expr="//label[@string='description']" position="attributes"> <xpath expr="//label[@string='description']" position="attributes">

2
addons/document_ftp/wizard/ftp_configuration_view.xml
View File

@ -17,7 +17,7 @@
<form position="attributes"> <form position="attributes">
<attribute name="string">Knowledge Application Configuration</attribute> <attribute name="string">Knowledge Application Configuration</attribute>
</form> </form>
<separator string="title" position="attributes"> <separator string="Title" position="attributes">
<attribute name="string">Configure FTP Server</attribute> <attribute name="string">Configure FTP Server</attribute>
</separator> </separator>
<xpath expr="//label[@string='description']" position="attributes"> <xpath expr="//label[@string='description']" position="attributes">

6
addons/email_template/email_template.py
View File

@ -128,7 +128,7 @@ class email_template(osv.osv):
"This is useful for CRM leads for example"), "This is useful for CRM leads for example"),
# Overridden mail.message.common fields for technical reasons: # Overridden mail.message.common fields for technical reasons:
'model': fields.related('model_id','model', type='char', string='Related Document model', 'model': fields.related('model_id','model', type='char', string='Related Document Model',
size=128, select=True, store=True, readonly=True), size=128, select=True, store=True, readonly=True),
# we need a separate m2m table to avoid ID collisions with the original mail.message entries # we need a separate m2m table to avoid ID collisions with the original mail.message entries
'attachment_ids': fields.many2many('ir.attachment', 'email_template_attachment_rel', 'email_template_id', 'attachment_ids': fields.many2many('ir.attachment', 'email_template_attachment_rel', 'email_template_id',
@ -146,8 +146,8 @@ class email_template(osv.osv):
'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing Mail Server', readonly=False, 'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing Mail Server', readonly=False,
help="Optional preferred server for outgoing mails. If not set, the highest " help="Optional preferred server for outgoing mails. If not set, the highest "
"priority one will be used."), "priority one will be used."),
'body_text': fields.text('Text contents', translate=True, help="Plaintext version of the message (placeholders may be used here)"), 'body_text': fields.text('Text Contents', translate=True, help="Plaintext version of the message (placeholders may be used here)"),
'body_html': fields.text('Rich-text contents', translate=True, help="Rich-text/HTML version of the message (placeholders may be used here)"), 'body_html': fields.text('Rich-Text Contents', translate=True, help="Rich-text/HTML version of the message (placeholders may be used here)"),
'message_id': fields.char('Message-Id', size=256, help="Message-ID SMTP header to use in outgoing messages based on this template. " 'message_id': fields.char('Message-Id', size=256, help="Message-ID SMTP header to use in outgoing messages based on this template. "
"Please note that this overrides the 'Resource Tracking' option, " "Please note that this overrides the 'Resource Tracking' option, "
"so if you simply need to track replies to outgoing emails, enable " "so if you simply need to track replies to outgoing emails, enable "

2
addons/email_template/email_template_view.xml
View File

@ -64,7 +64,7 @@
<page string="Advanced"> <page string="Advanced">
<group colspan="2" col="2"> <group colspan="2" col="2">
<group colspan="2" col="2"> <group colspan="2" col="2">
<separator string="Sidebar button" colspan="2"/> <separator string="Sidebar Button" colspan="2"/>
<button name="create_action" string="Add sidebar button" type="object" icon="gtk-execute" <button name="create_action" string="Add sidebar button" type="object" icon="gtk-execute"
colspan="2" attrs="{'invisible':[('ref_ir_act_window','!=',False)]}" colspan="2" attrs="{'invisible':[('ref_ir_act_window','!=',False)]}"
help="Display a button in the sidebar of related documents to open a composition wizard with this template" help="Display a button in the sidebar of related documents to open a composition wizard with this template"

6
addons/event_moodle/wizard_moodle.xml
View File

@ -8,14 +8,14 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Configure Moodle"> <form string="Configure Moodle">
<group> <group>
<separator string="server" colspan="4"/> <separator string="Server" colspan="4"/>
<field name="server_moodle"/> <field name="server_moodle"/>
<newline/> <newline/>
<separator string="Connexion with a token" colspan="4"/> <separator string="Connexion with a Token" colspan="4"/>
<label string="The easiest way to connect OpenERP with a moodle server is to create a 'token' in Moodle. It will be used to authenticate OpenERP as a trustable application." colspan="4"/> <label string="The easiest way to connect OpenERP with a moodle server is to create a 'token' in Moodle. It will be used to authenticate OpenERP as a trustable application." colspan="4"/>
<field name="moodle_token"/> <field name="moodle_token"/>
<newline/> <newline/>
<separator string="Connexion with password and username" colspan="4"/> <separator string="Connexion with Password and Username" colspan="4"/>
<label string="Another approach is to create a user for OpenERP in Moodle. If you do so, make sure that this user has enough access rights" colspan="4"/> <label string="Another approach is to create a user for OpenERP in Moodle. If you do so, make sure that this user has enough access rights" colspan="4"/>
<field name="moodle_username"/> <field name="moodle_username"/>
<field name="moodle_password"/> <field name="moodle_password"/>

2
addons/event_project/event_project_view.xml
View File

@ -12,7 +12,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<notebook position="inside"> <notebook position="inside">
<page string="Tasks"> <page string="Tasks">
<separator string="Tasks management" colspan="4"/> <separator string="Tasks Management" colspan="4"/>
<field name="project_id"/> <field name="project_id"/>
<button string="Create Retro-Planning" name="%(action_event_project)d" type="action" icon="gtk-execute"/> <button string="Create Retro-Planning" name="%(action_event_project)d" type="action" icon="gtk-execute"/>
<field name="task_ids" colspan="4" nolabel="1" widget="one2many_list" > <field name="task_ids" colspan="4" nolabel="1" widget="one2many_list" >

2
addons/fetchmail/fetchmail_view.xml
View File

@ -56,7 +56,7 @@
</page> </page>
<page string="Advanced" groups="base.group_extended"> <page string="Advanced" groups="base.group_extended">
<group colspan="2" col="2"> <group colspan="2" col="2">
<separator string="Advanced options" colspan="2"/> <separator string="Advanced Options" colspan="2"/>
<field name="priority" groups="base.group_extended"/> <field name="priority" groups="base.group_extended"/>
<field name="attach"/> <field name="attach"/>
<field name="original"/> <field name="original"/>

4
addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
View File

@ -7,7 +7,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Sign in / Sign out"> <form string="Sign in / Sign out">
<separator colspan="4" string="Sign in / Sign out"/> <separator colspan="4" string="Sign in/Sign out"/>
<label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/> <label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
<newline/> <newline/>
<group colspan="4" > <group colspan="4" >
@ -30,7 +30,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Sign in / Sign out"> <form string="Sign in / Sign out">
<separator string="Sign-Out Entry must follow Sign-In." colspan="4" /> <separator string="Sign-out Entry Must Follow Sign-in." colspan="4" />
<group colspan="4" col="6"> <group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Ok"/> <button icon="gtk-cancel" special="cancel" string="Ok"/>
</group> </group>

2
addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
View File

@ -9,7 +9,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Evaluation Reminders"> <form string="Evaluation Reminders">
<group width="340"> <group width="340">
<separator string="Send evaluation reminder" colspan="4"/> <separator string="Send Evaluation Reminder" colspan="4"/>
<field name="evaluation_id"/> <field name="evaluation_id"/>
<separator colspan="4"/> <separator colspan="4"/>
<group colspan="4"> <group colspan="4">

2
addons/hr_expense/hr_expense_view.xml
View File

@ -110,7 +110,7 @@
</page> </page>
<page string="Other Info" groups="base.group_extended"> <page string="Other Info" groups="base.group_extended">
<group col="2" colspan="2"> <group col="2" colspan="2">
<separator colspan="2" string="Accounting data"/> <separator colspan="2" string="Accounting Data"/>
<field name="journal_id"/> <field name="journal_id"/>
<field name="invoice_id" context="{'type':'in_invoice', 'journal_type': 'purchase'}"/> <field name="invoice_id" context="{'type':'in_invoice', 'journal_type': 'purchase'}"/>
</group> </group>

4
addons/hr_payroll/hr_payroll_view.xml
View File

@ -617,13 +617,13 @@
<field name="amount_fix" attrs="{'invisible':[('amount_select','&lt;&gt;','fix')], 'required':[('amount_select','=','fix')]}"/><newline/> <field name="amount_fix" attrs="{'invisible':[('amount_select','&lt;&gt;','fix')], 'required':[('amount_select','=','fix')]}"/><newline/>
<field name="amount_percentage" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required':[('amount_select','=','percentage')]}"/> <field name="amount_percentage" attrs="{'invisible':[('amount_select','&lt;&gt;','percentage')], 'required':[('amount_select','=','percentage')]}"/>
<field colspan="4" name="amount_python_compute" attrs="{'invisible':[('amount_select','&lt;&gt;','code')], 'required':[('amount_select','=','code')]}"/> <field colspan="4" name="amount_python_compute" attrs="{'invisible':[('amount_select','&lt;&gt;','code')], 'required':[('amount_select','=','code')]}"/>
<separator colspan="4" string="Company contribution"/> <separator colspan="4" string="Company Contribution"/>
<field name="register_id"/> <field name="register_id"/>
</group> </group>
</page> </page>
<page string="Child Rules"> <page string="Child Rules">
<field name="parent_rule_id"/> <field name="parent_rule_id"/>
<separator colspan="4" string="Children definition"/> <separator colspan="4" string="Children Definition"/>
<field colspan="4" name="child_ids" nolabel="1"/> <field colspan="4" name="child_ids" nolabel="1"/>
</page> </page>
<page string="Inputs"> <page string="Inputs">

2
addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
View File

@ -7,7 +7,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Sign In/Out By Project"> <form string="Sign In/Out By Project">
<separator colspan="4" string="Sign In/Out By Project"/> <separator colspan="4" string="Sign In/Out by Project"/>
<label colspan="4" nolabel="1" string="Employees can encode their time spent on the different projects they are assigned on. A project is an analytic account and the time spent on a project generates costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet."/> <label colspan="4" nolabel="1" string="Employees can encode their time spent on the different projects they are assigned on. A project is an analytic account and the time spent on a project generates costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet."/>
<newline/> <newline/>
<group colspan="4" col="6"> <group colspan="4" col="6">

2
addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
View File

@ -28,7 +28,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Invoice contract"> <form string="Invoice contract">
<group col="4" colspan="6"> <group col="4" colspan="6">
<separator string="Do you want to display work details on the invoice ?" colspan="4"/> <separator string="Do you want to display work details on the invoice?" colspan="4"/>
<field name="date"/> <field name="date"/>
<field name="time"/> <field name="time"/>
<field name="name"/> <field name="name"/>

2
addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
View File

@ -11,7 +11,7 @@
<notebook colspan="4"> <notebook colspan="4">
<page string="Billing Data"> <page string="Billing Data">
<group col="4" colspan="4"> <group col="4" colspan="4">
<separator string="Do you want to show details of work in invoice ?" colspan="4"/> <separator string="Do you want to show details of work in invoice?" colspan="4"/>
<field name="date"/> <field name="date"/>
<field name="time"/> <field name="time"/>
<field name="name"/> <field name="name"/>

4
addons/idea/idea_view.xml
View File

@ -169,7 +169,7 @@
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Idea" icon="terp-idea" domain="[]" context="{'group_by':'idea_id'}"/> <filter string="Idea" icon="terp-idea" domain="[]" context="{'group_by':'idea_id'}"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Vote date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/> <filter string="Vote Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
</group> </group>
</search> </search>
</field> </field>
@ -202,7 +202,7 @@
<page string="Comments"> <page string="Comments">
<field name="comment_ids" nolabel="1" colspan="4"> <field name="comment_ids" nolabel="1" colspan="4">
<form string="Comment"> <form string="Comment">
<separator string="Your comment" colspan="4"/> <separator string="Your Comment" colspan="4"/>
<field name="content" nolabel="1" /> <field name="content" nolabel="1" />
</form> </form>
<tree string="Comments"> <tree string="Comments">

2
addons/import_google/wizard/import_google_data_view.xml
View File

@ -13,7 +13,7 @@
<field name="create_partner" colspan="4"/> <field name="create_partner" colspan="4"/>
<newline/> <newline/>
<group attrs="{'invisible': [('create_partner','!=','create_all')]}" colspan="4" col="4"> <group attrs="{'invisible': [('create_partner','!=','create_all')]}" colspan="4" col="4">
<separator string="Partner status for this group:" colspan="4"/> <separator string="Partner Status for this Group:" colspan="4"/>
<field name="customer" colspan="4"/> <field name="customer" colspan="4"/>
<field name="supplier" colspan="4"/> <field name="supplier" colspan="4"/>
</group> </group>

2
addons/import_sugarcrm/import_sugarcrm_view.xml
View File

@ -62,7 +62,7 @@
</group> </group>
<group colspan="4"> <group colspan="4">
<separator string="Email Notification When Import is finished" colspan="4"/> <separator string="Email Notification When Import is Finished" colspan="4"/>
<field name="email_from" widget="email" string="Email Address to Notify" colspan="4"/> <field name="email_from" widget="email" string="Email Address to Notify" colspan="4"/>
</group> </group>

2
addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
View File

@ -45,7 +45,7 @@
<field name="partner_ids" colspan="4" nolabel="1" default_focus="1" height="300" width="500" readonly="1"/> <field name="partner_ids" colspan="4" nolabel="1" default_focus="1" height="300" width="500" readonly="1"/>
</page> </page>
<page string="Comments"> <page string="Comments">
<separator string="Free comments to be added to the declaration" colspan="4"/> <separator string="Free Comments to be Added to the Declaration" colspan="4"/>
<field name="comments" colspan="4" nolabel="1"/> <field name="comments" colspan="4" nolabel="1"/>
</page> </page>
</notebook> </notebook>

8
addons/l10n_ch/bank_view.xml
View File

@ -63,7 +63,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="state" position="after"> <field name="state" position="after">
<newline/> <newline/>
<separator colspan="4" string="Account infos"/> <separator colspan="4" string="Account Infos"/>
<group string="Bank account info" colspan="4" attrs="{'invisible': [('state','in', ['bvpost','bvrpost'])]}" > <group string="Bank account info" colspan="4" attrs="{'invisible': [('state','in', ['bvpost','bvrpost'])]}" >
<field name="acc_number" string="Account/IBAN Number" attrs="{'required': [('state','not in',['bvpost','bvrpost'])]}"/> <field name="acc_number" string="Account/IBAN Number" attrs="{'required': [('state','not in',['bvpost','bvrpost'])]}"/>
<field name="dta_code"/> <field name="dta_code"/>
@ -74,7 +74,7 @@
<field name="post_number" attrs="{'required': [('state','in',['bvpost','bvrpost','bvrbank'])]}"/> <field name="post_number" attrs="{'required': [('state','in',['bvpost','bvrpost','bvrbank'])]}"/>
<newline/> <newline/>
</group> </group>
<separator colspan="4" string="Financial institute infos"/> <separator colspan="4" string="Financial Institute Infos"/>
<field name="bank" /> <field name="bank" />
</field> </field>
</field> </field>
@ -116,7 +116,7 @@
<field name="state" position="after"> <field name="state" position="after">
<newline/> <newline/>
<separator colspan="4" string="Account infos"/> <separator colspan="4" string="Account Infos"/>
<newline/> <newline/>
<group string="Bank account info" colspan="4" attrs="{'invisible': [('state','in', ['bvpost','bvrpost'])]}" > <group string="Bank account info" colspan="4" attrs="{'invisible': [('state','in', ['bvpost','bvrpost'])]}" >
<field name="acc_number" string="Account/IBAN Number" attrs="{'required': [('state','not in',['bvpost','bvrpost'])]}"/> <field name="acc_number" string="Account/IBAN Number" attrs="{'required': [('state','not in',['bvpost','bvrpost'])]}"/>
@ -128,7 +128,7 @@
<field name="post_number" attrs="{'required': [('state','in',['bvpost','bvrpost','bvrbank'])]}"/> <field name="post_number" attrs="{'required': [('state','in',['bvpost','bvrpost','bvrbank'])]}"/>
<newline/> <newline/>
</group> </group>
<separator colspan="4" string="Financial institute infos"/> <separator colspan="4" string="Financial Institute Infos"/>
<newline/> <newline/>
<group attrs="{'invisible': ['|', ('state', 'not in', ['bvrpost','bvrbank']), ('company_id', '=', False)]}" colspan="4"> <group attrs="{'invisible': ['|', ('state', 'not in', ['bvrpost','bvrbank']), ('company_id', '=', False)]}" colspan="4">
<field name="my_bank" attrs="{'invisible': [('company_id', '=', False)]}" /> <field name="my_bank" attrs="{'invisible': [('company_id', '=', False)]}" />

2
addons/lunch/lunch_view.xml
View File

@ -226,7 +226,7 @@
<field name="model">lunch.category</field> <field name="model">lunch.category</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Category"> <form string="Category">
<separator string="Category related to Products" colspan="4"/> <separator string="Category Related to Products" colspan="4"/>
<field name="name" select="1"/> <field name="name" select="1"/>
</form> </form>
</field> </field>

6
addons/mail/mail_group_view.xml
View File

@ -53,18 +53,18 @@
<form string="Group"> <form string="Group">
<group colspan="4" col="8"> <group colspan="4" col="8">
<group colspan="6" col="4"> <group colspan="6" col="4">
<separator string="General information" colspan="4"/> <separator string="General Information" colspan="4"/>
<field name="name" colspan="2"/> <field name="name" colspan="2"/>
<field name="responsible_id" colspan="2"/> <field name="responsible_id" colspan="2"/>
<newline/> <newline/>
<field name="description" colspan="4"/> <field name="description" colspan="4"/>
</group> </group>
<group colspan="1" col="2"> <group colspan="1" col="2">
<separator string="Group image" colspan="2"/> <separator string="Group Image" colspan="2"/>
<field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/> <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
</group> </group>
<group colspan="1" col="2"> <group colspan="1" col="2">
<separator string="Privacy settings" colspan="2"/> <separator string="Privacy Settings" colspan="2"/>
<field name="public" nolabel="1"/> <field name="public" nolabel="1"/>
<label string="This group is visible by non members" colspan="2"/> <label string="This group is visible by non members" colspan="2"/>
</group> </group>

2
addons/mail/mail_message.py
View File

@ -207,7 +207,7 @@ class mail_message(osv.osv):
('notification', 'System notification'), ('notification', 'System notification'),
], 'Type', help="Message type: e-mail for e-mail message, notification for system message, comment for other messages such as user replies"), ], 'Type', help="Message type: e-mail for e-mail message, notification for system message, comment for other messages such as user replies"),
'partner_id': fields.many2one('res.partner', 'Related partner'), 'partner_id': fields.many2one('res.partner', 'Related partner'),
'user_id': fields.many2one('res.users', 'Related user', readonly=1), 'user_id': fields.many2one('res.users', 'Related User', readonly=1),
'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'), 'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments'),
'display_text': fields.function(_get_display_text, method=True, type='text', size="512", string='Display Text'), 'display_text': fields.function(_get_display_text, method=True, type='text', size="512", string='Display Text'),
'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing mail server', readonly=1), 'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing mail server', readonly=1),

2
addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
View File

@ -10,7 +10,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Create invoices"> <form string="Create invoices">
<separator colspan="4" string="Do you really want to create the invoice(s) ?" /> <separator colspan="4" string="Do you really want to create the invoice(s)?" />
<field name="group"/> <field name="group"/>
<newline/> <newline/>
<group col="2" colspan="4"> <group col="2" colspan="4">

2
addons/plugin_outlook/plugin_outlook.xml
View File

@ -10,7 +10,7 @@
<form position="attributes"> <form position="attributes">
<attribute name="string">Install Outlook Plug-In</attribute> <attribute name="string">Install Outlook Plug-In</attribute>
</form> </form>
<separator string="title" position="attributes"> <separator string="Title" position="attributes">
<attribute name="string">Install Outlook Plug-In</attribute> <attribute name="string">Install Outlook Plug-In</attribute>
</separator> </separator>
<xpath expr="//label[@string='description']" position="attributes"> <xpath expr="//label[@string='description']" position="attributes">

2
addons/plugin_thunderbird/plugin_thunderbird.xml
View File

@ -11,7 +11,7 @@
<form position="attributes"> <form position="attributes">
<attribute name="string">Install Thunderbird Plug-In</attribute> <attribute name="string">Install Thunderbird Plug-In</attribute>
</form> </form>
<separator string="title" position="attributes"> <separator string="Title" position="attributes">
<attribute name="string">Install Thunderbird Plug-In</attribute> <attribute name="string">Install Thunderbird Plug-In</attribute>
</separator> </separator>
<xpath expr="//label[@string='description']" position="attributes"> <xpath expr="//label[@string='description']" position="attributes">

2
addons/point_of_sale/point_of_sale_view.xml
View File

@ -607,7 +607,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<group name="status" position="after"> <group name="status" position="after">
<group colspan="2" col="2" name="pos"> <group colspan="2" col="2" name="pos">
<separator string="Point-of-Sale" colspan="2"/> <separator string="Point of Sale" colspan="2"/>
<field name="pos_categ_id"/> <field name="pos_categ_id"/>
</group> </group>
</group> </group>

2
addons/point_of_sale/report/report_cash_register_view.xml
View File

@ -65,7 +65,7 @@
<filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/> <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
<filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/> <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/> <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day from Creation date of cash register"/> <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day from Creation date of cash register"/>
<filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Month from Creation date of cash register"/> <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Month from Creation date of cash register"/>

2
addons/point_of_sale/wizard/pos_close_statement.xml
View File

@ -9,7 +9,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Close Cash Registers"> <form string="Close Cash Registers">
<separator colspan="4" string="Do you want to close your cash registers ?"/> <separator colspan="4" string="Do you want to close your cash registers?"/>
<label string="OpenERP will close all cash registers he can close automatically without validation. He will also open all cash registers for which you have to control the ending balance before closing manually."/> <label string="OpenERP will close all cash registers he can close automatically without validation. He will also open all cash registers for which you have to control the ending balance before closing manually."/>
<separator colspan="4"/> <separator colspan="4"/>
<group col="4" colspan="4"> <group col="4" colspan="4">

2
addons/point_of_sale/wizard/pos_open_statement.xml
View File

@ -9,7 +9,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Open Statements"> <form string="Open Statements">
<separator colspan="4" string="Do you want to open cash registers ?"/> <separator colspan="4" string="Do you want to open cash registers?"/>
<label string="The system will open all cash registers, so that you can start recording payments. We suggest you to control the opening balance of each register, using their CashBox tab." colspan="4" align="0.0"/> <label string="The system will open all cash registers, so that you can start recording payments. We suggest you to control the opening balance of each register, using their CashBox tab." colspan="4" align="0.0"/>
<separator colspan="4"/> <separator colspan="4"/>
<group col="4" colspan="4"> <group col="4" colspan="4">

2
addons/point_of_sale/wizard/pos_receipt_view.xml
View File

@ -10,7 +10,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Receipt :"> <form string="Receipt :">
<separator string="Print the receipt of the sale" colspan="4"/> <separator string="Print the Receipt of the Sale" colspan="4"/>
<button icon='gtk-cancel' special="cancel" <button icon='gtk-cancel' special="cancel"
string="Cancel" /> string="Cancel" />
<button name="print_report" string="Print Receipt" <button name="print_report" string="Print Receipt"

2
addons/portal/portal_view.xml
View File

@ -48,7 +48,7 @@ the portal's users.
<field name="url" widget="url"/> <field name="url" widget="url"/>
</group> </group>
<group colspan="2" col="2"> <group colspan="2" col="2">
<separator string="Widgets assigned to Users" colspan="2"/> <separator string="Widgets Assigned to Users" colspan="2"/>
<field name="widget_ids" nolabel="1" colspan="2"> <field name="widget_ids" nolabel="1" colspan="2">
<tree string="Widgets" editable="bottom"> <tree string="Widgets" editable="bottom">
<field name="sequence"/> <field name="sequence"/>

2
addons/product/product_view.xml
View File

@ -673,7 +673,7 @@
</group> </group>
<group colspan="2" col="2" name="uom"> <group colspan="2" col="2" name="uom">
<separator string="UOM" colspan="2"/> <separator string="UoM" colspan="2"/>
<field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" groups="product.group_uom"/> <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" groups="product.group_uom"/>
<field name="uom_po_id" groups="base.group_extended"/> <field name="uom_po_id" groups="base.group_extended"/>
</group> </group>

2
addons/product/wizard/product_price_view.xml
View File

@ -10,7 +10,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Price List"> <form string="Price List">
<separator colspan="4" string="Calculate Product Price per unit base on pricelist version."/> <separator colspan="4" string="Calculate Product Price per Unit Based on Pricelist Version."/>
<field name="price_list" widget="selection"/> <field name="price_list" widget="selection"/>
<field name="qty1" colspan="2" /> <field name="qty1" colspan="2" />
<field name="qty2" colspan="2" /> <field name="qty2" colspan="2" />

2
addons/project_long_term/project_long_term_view.xml
View File

@ -161,7 +161,7 @@
<field name="constraint_date_end"/> <field name="constraint_date_end"/>
</group> </group>
<group colspan="2" col="2"> <group colspan="2" col="2">
<separator string="Displaying settings" colspan="2"/> <separator string="Displaying Settings" colspan="2"/>
<field name="sequence"/> <field name="sequence"/>
</group> </group>
<separator colspan="4" string="Force Assigned Users"/> <separator colspan="4" string="Force Assigned Users"/>

2
addons/project_planning/project_planning_view.xml
View File

@ -308,7 +308,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<notebook position="inside"> <notebook position="inside">
<page string="Planning" > <page string="Planning" >
<separator string="Planning lines"/> <separator string="Planning Lines"/>
<field name="planning_ids" colspan="4" nolabel="1"> <field name="planning_ids" colspan="4" nolabel="1">
<form string="Planning Lines"> <form string="Planning Lines">
<field name="planning_id" select="1"/> <field name="planning_id" select="1"/>

4
addons/project_scrum/project_scrum_view.xml
View File

@ -277,7 +277,7 @@
<separator colspan="4" string=""/> <separator colspan="4" string=""/>
</page> </page>
<page string="Optional Info"> <page string="Optional Info">
<separator colspan="4" string="Are your Sprint Backlog estimate accurate ?"/> <separator colspan="4" string="Are your sprint backlog estimate accurate ?"/>
<field colspan="4" name="question_backlog" nolabel="1"/> <field colspan="4" name="question_backlog" nolabel="1"/>
</page> </page>
<page string="Links"> <page string="Links">
@ -409,7 +409,7 @@
<separator colspan="4" string=""/> <separator colspan="4" string=""/>
</page> </page>
<page string="Optional Info"> <page string="Optional Info">
<separator colspan="4" string="Are your Sprint Backlog estimate accurate ?"/> <separator colspan="4" string="Are your sprint backlog estimate accurate?"/>
<field colspan="4" name="question_backlog" nolabel="1"/> <field colspan="4" name="question_backlog" nolabel="1"/>
</page> </page>
<page string="Links"> <page string="Links">

2
addons/project_scrum/wizard/project_scrum_backlog_merger_view.xml
View File

@ -7,7 +7,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Merge Backlogs"> <form string="Merge Backlogs">
<separator string="Are you sure you want to merge these Backlogs?" colspan="4"/> <separator string="Are you sure you want to merge these backlogs?" colspan="4"/>
<label colspan="4" string="This wizard merge backlogs and create one new backlog with draft state (Old backlogs Will be deleted). And it also merge old tasks from backlogs" /> <label colspan="4" string="This wizard merge backlogs and create one new backlog with draft state (Old backlogs Will be deleted). And it also merge old tasks from backlogs" />
<separator colspan="4"/> <separator colspan="4"/>
<button colspan="2" special="cancel" string="Cancel" icon="gtk-cancel"/> <button colspan="2" special="cancel" string="Cancel" icon="gtk-cancel"/>

2
addons/purchase/purchase_view.xml
View File

@ -223,7 +223,7 @@
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase order which are in the exception state"/> <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" help="Purchase order which are in the exception state"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced." groups="base.group_extended"/> <filter icon="terp-gtk-go-back-rtl" name="not_invoiced" string="Not Invoiced" domain="[('invoice_ids','=', False)]" help="Purchase orders that include lines not invoiced." groups="base.group_extended"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="name" string="Reference"/> <field name="name" string="Reference"/>
<field name="partner_id"/> <field name="partner_id"/>

2
addons/purchase/wizard/purchase_line_invoice_view.xml
View File

@ -10,7 +10,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Select an Open Sale Order"> <form string="Select an Open Sale Order">
<separator colspan="4" string="Do you want to generate the supplier invoices ?" /> <separator colspan="4" string="Do you want to generate the supplier invoices?" />
<group col="2" colspan="4"> <group col="2" colspan="4">
<button icon='gtk-cancel' special="cancel" <button icon='gtk-cancel' special="cancel"
string="Cancel" /> string="Cancel" />

2
addons/purchase/wizard/purchase_order_group_view.xml
View File

@ -7,7 +7,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Merge orders"> <form string="Merge orders">
<separator string="Are you sure you want to merge these orders ?" colspan="4"/> <separator string="Are you sure you want to merge these orders?" colspan="4"/>
<newline/> <newline/>
<label string=" <label string="
Please note that: &#10; &#10; Please note that: &#10; &#10;

10
addons/resource/resource.py
View File

@ -36,7 +36,7 @@ class resource_calendar(osv.osv):
'name' : fields.char("Name", size=64, required=True), 'name' : fields.char("Name", size=64, required=True),
'company_id' : fields.many2one('res.company', 'Company', required=False), 'company_id' : fields.many2one('res.company', 'Company', required=False),
'attendance_ids' : fields.one2many('resource.calendar.attendance', 'calendar_id', 'Working Time'), 'attendance_ids' : fields.one2many('resource.calendar.attendance', 'calendar_id', 'Working Time'),
'manager' : fields.many2one('res.users', 'Workgroup manager'), 'manager' : fields.many2one('res.users', 'Workgroup Manager'),
} }
_defaults = { _defaults = {
'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.calendar', context=context) 'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.calendar', context=context)
@ -260,8 +260,8 @@ class resource_calendar_attendance(osv.osv):
_columns = { _columns = {
'name' : fields.char("Name", size=64, required=True), 'name' : fields.char("Name", size=64, required=True),
'dayofweek': fields.selection([('0','Monday'),('1','Tuesday'),('2','Wednesday'),('3','Thursday'),('4','Friday'),('5','Saturday'),('6','Sunday')], 'Day of week', required=True, select=True), 'dayofweek': fields.selection([('0','Monday'),('1','Tuesday'),('2','Wednesday'),('3','Thursday'),('4','Friday'),('5','Saturday'),('6','Sunday')], 'Day of Week', required=True, select=True),
'date_from' : fields.date('Starting date'), 'date_from' : fields.date('Starting Date'),
'hour_from' : fields.float('Work from', size=8, required=True, help="Working time will start from", select=True), 'hour_from' : fields.float('Work from', size=8, required=True, help="Working time will start from", select=True),
'hour_to' : fields.float("Work to", size=8, required=True, help="Working time will end at"), 'hour_to' : fields.float("Work to", size=8, required=True, help="Working time will end at"),
'calendar_id' : fields.many2one("resource.calendar", "Resource's Calendar", required=True), 'calendar_id' : fields.many2one("resource.calendar", "Resource's Calendar", required=True),
@ -292,7 +292,7 @@ class resource_resource(osv.osv):
'company_id' : fields.many2one('res.company', 'Company'), 'company_id' : fields.many2one('res.company', 'Company'),
'resource_type': fields.selection([('user','Human'),('material','Material')], 'Resource Type', required=True), 'resource_type': fields.selection([('user','Human'),('material','Material')], 'Resource Type', required=True),
'user_id' : fields.many2one('res.users', 'User', help='Related user name for the resource to manage its access.'), 'user_id' : fields.many2one('res.users', 'User', help='Related user name for the resource to manage its access.'),
'time_efficiency' : fields.float('Efficiency factor', size=8, required=True, help="This field depict the efficiency of the resource to complete tasks. e.g resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficency of 200%, then his load will only be 50%."), 'time_efficiency' : fields.float('Efficiency Factor', size=8, required=True, help="This field depict the efficiency of the resource to complete tasks. e.g resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficency of 200%, then his load will only be 50%."),
'calendar_id' : fields.many2one("resource.calendar", "Working Time", help="Define the schedule of resource"), 'calendar_id' : fields.many2one("resource.calendar", "Working Time", help="Define the schedule of resource"),
} }
_defaults = { _defaults = {
@ -421,7 +421,7 @@ class resource_calendar_leaves(osv.osv):
_columns = { _columns = {
'name' : fields.char("Name", size=64), 'name' : fields.char("Name", size=64),
'company_id' : fields.related('calendar_id','company_id',type='many2one',relation='res.company',string="Company", store=True, readonly=True), 'company_id' : fields.related('calendar_id','company_id',type='many2one',relation='res.company',string="Company", store=True, readonly=True),
'calendar_id' : fields.many2one("resource.calendar", "Working time"), 'calendar_id' : fields.many2one("resource.calendar", "Working Time"),
'date_from' : fields.datetime('Start Date', required=True), 'date_from' : fields.datetime('Start Date', required=True),
'date_to' : fields.datetime('End Date', required=True), 'date_to' : fields.datetime('End Date', required=True),
'resource_id' : fields.many2one("resource.resource", "Resource", help="If empty, this is a generic holiday for the company. If a resource is set, the holiday/leave is only for this resource"), 'resource_id' : fields.many2one("resource.resource", "Resource", help="If empty, this is a generic holiday for the company. If a resource is set, the holiday/leave is only for this resource"),

2
addons/sale/wizard/sale_line_invoice.xml
View File

@ -7,7 +7,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Create invoices"> <form string="Create invoices">
<separator colspan="4" string="Do you really want to create the invoice(s) ?" /> <separator colspan="4" string="Do you really want to create the invoice(s)?" />
<button special="cancel" string="Cancel" icon="gtk-cancel"/> <button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/> <button name="make_invoices" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
</form> </form>

2
addons/sale/wizard/sale_make_invoice.xml
View File

@ -7,7 +7,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Create invoices"> <form string="Create invoices">
<separator colspan="4" string="Do you really want to create the invoice(s) ?" /> <separator colspan="4" string="Do you really want to create the invoice(s)?" />
<field name="grouped"/> <field name="grouped"/>
<newline/> <newline/>
<field name="invoice_date"/> <field name="invoice_date"/>

8
addons/share/wizard/share_wizard_view.xml
View File

@ -32,17 +32,17 @@
<field name="user_type" invisible="1"/> <field name="user_type" invisible="1"/>
<field name="invite" invisible="1"/> <field name="invite" invisible="1"/>
<group colspan="4" name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}"> <group colspan="4" name="emails_group" attrs="{'invisible':['|', ('user_type', '!=', 'emails'), ('invite', '=', True)]}">
<separator colspan="4" string="Share with these people (one e-mail per line)"/> <separator colspan="4" string="Share with these People (one e-mail per line)"/>
<field colspan="4" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/> <field colspan="4" nolabel="1" name="new_users" attrs="{'required':[('user_type','=','emails'), ('invite', '!=', True)]}"/>
</group> </group>
<group colspan="4" col="2" name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}"> <group colspan="4" col="2" name="email_lines" attrs="{'invisible':[('invite', '!=', True)]}">
<separator colspan="4" string="Share with these people (one e-mail per line)"/> <separator colspan="4" string="Share with these People (one e-mail per line)"/>
<field name="email_1"/> <field name="email_1"/>
<field name="email_2"/> <field name="email_2"/>
<field name="email_3"/> <field name="email_3"/>
</group> </group>
<group colspan="4" col="4" attrs="{'invisible':[('user_type', '=', 'embedded')]}"> <group colspan="4" col="4" attrs="{'invisible':[('user_type', '=', 'embedded')]}">
<separator colspan="4" string="Include an optional personal message"/> <separator colspan="4" string="Include an Optional Personal Message"/>
<field name="message" colspan="4" nolabel="1"/> <field name="message" colspan="4" nolabel="1"/>
</group> </group>
<group colspan="4" col="4" attrs="{'invisible':[('invite', '=', True)]}"> <group colspan="4" col="4" attrs="{'invisible':[('invite', '=', True)]}">
@ -79,7 +79,7 @@
</field> </field>
</group> </group>
<group colspan="4" col="1" attrs="{'invisible':[('user_type','!=','embedded')]}"> <group colspan="4" col="1" attrs="{'invisible':[('user_type','!=','embedded')]}">
<separator string="Use this link"/> <separator string="Use this Link"/>
<field name="embed_url" nolabel="1"/> <field name="embed_url" nolabel="1"/>
<separator string="Or insert the following code where you want to embed your documents"/> <separator string="Or insert the following code where you want to embed your documents"/>
<group col="4" string="Options"> <group col="4" string="Options">

6
addons/stock/stock_view.xml
View File

@ -1240,7 +1240,7 @@
<separator orientation="vertical" /> <separator orientation="vertical" />
<filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/> <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string="To invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" /> <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]" />
<separator orientation="vertical"/> <separator orientation="vertical"/>
<field name="name"/> <field name="name"/>
<field name="origin"/> <field name="origin"/>
@ -1441,7 +1441,7 @@
<group colspan="2" col="4" groups="base.group_extended"> <group colspan="2" col="4" groups="base.group_extended">
<separator string="Traceability" colspan="4" groups="base.group_extended"/> <separator string="Traceability" colspan="4" groups="base.group_extended"/>
<field name="tracking_id" colspan="3" groups="stock.group_tracking_lot"/> <field name="tracking_id" colspan="3" groups="stock.group_tracking_lot"/>
<button name="%(split_into)d" string="New pack" type="action" <button name="%(split_into)d" string="New Pack" type="action"
groups="product.group_stock_packaging" groups="product.group_stock_packaging"
icon="terp-stock_effects-object-colorize" icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed" colspan="1"/> states="draft,assigned,confirmed" colspan="1"/>
@ -1627,7 +1627,7 @@
<group colspan="2" col="4"> <group colspan="2" col="4">
<separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/> <separator string="Traceability" colspan="4" groups="stock.group_tracking_lot"/>
<field name="tracking_id" colspan="3" groups="stock.group_tracking_lot"/> <field name="tracking_id" colspan="3" groups="stock.group_tracking_lot"/>
<button name="%(split_into)d" string="New pack" type="action" <button name="%(split_into)d" string="New Pack" type="action"
groups="product.group_stock_packaging" groups="product.group_stock_packaging"
icon="terp-stock_effects-object-colorize" icon="terp-stock_effects-object-colorize"
states="draft,assigned,confirmed,done" colspan="1"/> states="draft,assigned,confirmed,done" colspan="1"/>

4
addons/stock/wizard/stock_inventory_merge_view.xml
View File

@ -8,8 +8,8 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Merge inventories"> <form string="Merge inventories">
<separator colspan="4" string="Merge inventories" /> <separator colspan="4" string="Merge Inventories" />
<label string="Do you want to merge theses inventories ?"/> <label string="Do you want to merge theses inventories?"/>
<separator colspan="4"/> <separator colspan="4"/>
<group colspan="4" col="6"> <group colspan="4" col="6">
<button special="cancel" string="_Cancel" icon='gtk-cancel'/> <button special="cancel" string="_Cancel" icon='gtk-cancel'/>

2
addons/stock/wizard/stock_invoice_onshipping_view.xml
View File

@ -7,7 +7,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Create invoice"> <form string="Create invoice">
<separator colspan="4" string="Create invoice" /> <separator colspan="4" string="Create Invoice" />
<field name="journal_id"/> <field name="journal_id"/>
<newline/> <newline/>
<field name="group"/> <field name="group"/>

2
addons/stock/wizard/stock_splitinto_view.xml
View File

@ -7,7 +7,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Split Move"> <form string="Split Move">
<separator string="Quantity to leave in the current pack" colspan="4"/> <separator string="Quantity to Leave in the Current Pack" colspan="4"/>
<field name="quantity"/> <field name="quantity"/>
<button icon='gtk-cancel' special="cancel" <button icon='gtk-cancel' special="cancel"
string="_Cancel" /> string="_Cancel" />

6
addons/stock_planning/stock_planning_view.xml
View File

@ -105,7 +105,7 @@
</group> </group>
</group> </group>
<separator colspan ="4" string="Sales history"/> <separator colspan ="4" string="Sales History"/>
<group colspan = "4" col = "5"> <group colspan = "4" col = "5">
<label string = " "/> <label string = " "/>
<label string = "Per User :"/> <label string = "Per User :"/>
@ -204,7 +204,7 @@
<filter string="Warehouse " icon="terp-go-home" domain="[]" context="{'group_by':'warehouse_id'}"/> <filter string="Warehouse " icon="terp-go-home" domain="[]" context="{'group_by':'warehouse_id'}"/>
<filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/> <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
<separator orientation="vertical"/> <separator orientation="vertical"/>
<filter string='Default UOM' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}" /> <filter string='Default UoM' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}" />
</group> </group>
</search> </search>
</field> </field>
@ -286,7 +286,7 @@
<field name="stock_supply_location"/> <field name="stock_supply_location"/>
</group> </group>
</group> </group>
<separator colspan ="4" string = "Procurement history"/> <separator colspan ="4" string = "Procurement History"/>
<field name = "history" colspan = "2" nolabel = "1"/> <field name = "history" colspan = "2" nolabel = "1"/>
</form> </form>
</field> </field>

2
addons/survey/wizard/survey_browse_answer.xml
View File

@ -12,7 +12,7 @@
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Survey"> <form string="Survey">
<separator colspan="4" string = "Select Survey and related answer"/> <separator colspan="4" string = "Select Survey and Related Answer"/>
<field name="survey_id" width="250"/> <field name="survey_id" width="250"/>
<field name="response_id" domain="[('survey_id','=', survey_id)]"/> <field name="response_id" domain="[('survey_id','=', survey_id)]"/>
<separator colspan="4" /> <separator colspan="4" />

4
addons/survey/wizard/survey_send_invitation.xml
View File

@ -12,10 +12,10 @@
<form string="Send Invitation"> <form string="Send Invitation">
<separator string="Select Partner" colspan="4"/> <separator string="Select Partner" colspan="4"/>
<field name="partner_ids" nolabel="1" colspan="4"/> <field name="partner_ids" nolabel="1" colspan="4"/>
<separator colspan="4" string="Send mail for new user"/> <separator colspan="4" string="Send Mail for New User"/>
<field name="send_mail" nolabel="1"/> <field name="send_mail" nolabel="1"/>
<field name="mail_subject" colspan="3"/> <field name="mail_subject" colspan="3"/>
<separator colspan="4" string="Send reminder for existing user"/> <separator colspan="4" string="Send Reminder for Existing User"/>
<field name="send_mail_existing" nolabel="1"/> <field name="send_mail_existing" nolabel="1"/>
<field name="mail_subject_existing" colspan="3"/> <field name="mail_subject_existing" colspan="3"/>
<separator colspan="4"/> <separator colspan="4"/>