Christophe (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-labelmultilines-chs into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-labelmultilines-chs/+merge/91854
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-labelmultilines-chs/+merge/91854
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-labelmultilines-chs.
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2012-01-31 13:36:57 +0000
+++ account/account_view.xml 2012-02-07 15:33:30 +0000
@@ -978,9 +978,9 @@
<field name="amount" attrs="{'readonly':[('type','in',('none', 'code', 'balance'))]}"/>
<separator colspan="4" string="Accounting Information"/>
<field name="account_collected_id" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
- <label colspan="2" nolabel="1" string="Keep empty to use the income account"/>
+ <label colspan="2" string="Keep empty to use the income account"/>
<field name="account_paid_id" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
- <label colspan="2" nolabel="1" string="Keep empty to use the expense account"/>
+ <label colspan="2" string="Keep empty to use the expense account"/>
<separator colspan="4" string="Tax Declaration: Invoices"/>
<field name="base_code_id"/>
<field name="base_sign"/>
@@ -2291,9 +2291,9 @@
<field groups="base.group_extended" name="domain"/>
<newline/>
<field name="account_collected_id"/>
- <label colspan="2" nolabel="1" string="Keep empty to use the income account"/>
+ <label colspan="2" string="Keep empty to use the income account"/>
<field name="account_paid_id"/>
- <label colspan="2" nolabel="1" string="Keep empty to use the expense account"/>
+ <label colspan="2" string="Keep empty to use the expense account"/>
<field groups="base.group_extended" name="child_depend"/>
<field groups="base.group_extended" name="sequence"/>
</page>
=== modified file 'account/wizard/account_automatic_reconcile_view.xml'
--- account/wizard/account_automatic_reconcile_view.xml 2011-10-16 01:28:00 +0000
+++ account/wizard/account_automatic_reconcile_view.xml 2012-02-07 15:33:30 +0000
@@ -9,7 +9,7 @@
<field name="arch" type="xml">
<form string="Reconciliation">
<separator string="Reconciliation" colspan="4"/>
- <label colspan="4" nolabel="1" string="For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP makes its own search for entries to reconcile in a series of accounts. It finds entries for each partner where the amounts correspond."/>
+ <label colspan="4" 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."/>
<newline/>
<group>
<field name="account_ids" colspan="4" domain="[('reconcile','=',1)]"/>
=== modified file 'account/wizard/account_report_account_balance_view.xml'
--- account/wizard/account_report_account_balance_view.xml 2011-11-16 11:58:10 +0000
+++ account/wizard/account_report_account_balance_view.xml 2012-02-07 15:33:30 +0000
@@ -15,7 +15,7 @@
</xpath>
<xpath expr="/form/label[@string='']" position="replace">
<separator string="Trial Balance" colspan="4"/>
- <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your trial balance allowing you to quickly check the balance of each of your accounts in a single report"/>
+ <label colspan="4" string="This report allows you to print or generate a pdf of your trial balance allowing you to quickly check the balance of each of your accounts in a single report"/>
</xpath>
<xpath expr="//field[@name='target_move']" position="after">
<field name="display_account"/>
=== modified file 'account/wizard/account_report_aged_partner_balance_view.xml'
--- account/wizard/account_report_aged_partner_balance_view.xml 2011-10-16 01:28:00 +0000
+++ account/wizard/account_report_aged_partner_balance_view.xml 2012-02-07 15:33:30 +0000
@@ -10,7 +10,7 @@
<field name="arch" type="xml">
<form string="Report Options">
<separator colspan="4" string="Aged Partner Balance"/>
- <label colspan="4" nolabel="1" string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
+ <label colspan="4" string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
<newline/>
<field name="chart_account_id" widget='selection'/>
<newline/>
=== modified file 'account/wizard/account_report_common_view.xml'
--- account/wizard/account_report_common_view.xml 2012-01-31 13:36:57 +0000
+++ account/wizard/account_report_common_view.xml 2012-02-07 15:33:30 +0000
@@ -8,7 +8,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Report Options">
- <label nolabel="1" string=""/>
+ <label string=""/>
<newline/>
<field name="chart_account_id" widget='selection' on_change="onchange_chart_id(chart_account_id, context)"/>
<field name="company_id" invisible="1"/>
=== modified file 'account/wizard/account_report_general_journal_view.xml'
--- account/wizard/account_report_general_journal_view.xml 2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_general_journal_view.xml 2012-02-07 15:33:30 +0000
@@ -11,7 +11,7 @@
<data>
<xpath expr="/form/label[@string='']" position="replace">
<separator string="General Journals" colspan="4"/>
- <label nolabel="1" colspan="4" string="This report gives you an overview of the situation of your general journals"/>
+ <label colspan="4" string="This report gives you an overview of the situation of your general journals"/>
</xpath>
<xpath expr="//field[@name='target_move']" position="after">
<field name="amount_currency"/>
=== modified file 'account/wizard/account_report_general_ledger_view.xml'
--- account/wizard/account_report_general_ledger_view.xml 2011-11-16 11:58:10 +0000
+++ account/wizard/account_report_general_ledger_view.xml 2012-02-07 15:33:30 +0000
@@ -11,7 +11,7 @@
<data>
<xpath expr="/form/label[@string='']" position="replace">
<separator string="General Ledger" colspan="4"/>
- <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your general ledger with details of all your account journals"/>
+ <label colspan="4" string="This report allows you to print or generate a pdf of your general ledger with details of all your account journals"/>
</xpath>
<xpath expr="//field[@name='target_move']" position="after">
<field name="display_account"/>
=== modified file 'account/wizard/account_report_partner_balance_view.xml'
--- account/wizard/account_report_partner_balance_view.xml 2011-10-16 01:28:00 +0000
+++ account/wizard/account_report_partner_balance_view.xml 2012-02-07 15:33:30 +0000
@@ -11,7 +11,7 @@
<data>
<xpath expr="/form/label[@string='']" position="replace">
<separator string="Partner Balance" colspan="4"/>
- <label nolabel="1" colspan="4" string="This report is an analysis done by a partner. It is a PDF report containing one line per partner representing the cumulative credit balance"/>
+ <label colspan="4" string="This report is an analysis done by a partner. It is a PDF report containing one line per partner representing the cumulative credit balance"/>
</xpath>
<xpath expr="//field[@name='target_move']" position="after">
<field name="result_selection"/>
=== modified file 'account/wizard/account_report_partner_ledger_view.xml'
--- account/wizard/account_report_partner_ledger_view.xml 2011-10-16 01:28:00 +0000
+++ account/wizard/account_report_partner_ledger_view.xml 2012-02-07 15:33:30 +0000
@@ -11,7 +11,7 @@
<data>
<xpath expr="/form/label[@string='']" position="replace">
<separator string="Partner Ledger" colspan="4"/>
- <label nolabel="1" colspan="4" string="This report is an analysis done by a partner. It is a PDF report containing one line per partner representing the cumulative credit balance"/>
+ <label colspan="4" string="This report is an analysis done by a partner. It is a PDF report containing one line per partner representing the cumulative credit balance"/>
</xpath>
<xpath expr="//field[@name='target_move']" position="after">
<field name="result_selection"/>
=== modified file 'account/wizard/account_report_print_journal_view.xml'
--- account/wizard/account_report_print_journal_view.xml 2012-02-03 14:53:20 +0000
+++ account/wizard/account_report_print_journal_view.xml 2012-02-07 15:33:30 +0000
@@ -11,7 +11,7 @@
<data>
<xpath expr="/form/label[@string='']" position="replace">
<separator string="Journals" colspan="4"/>
- <label nolabel="1" colspan="4" string="This report gives you an overview of the situation of a specific journal"/>
+ <label colspan="4" string="This report gives you an overview of the situation of a specific journal"/>
</xpath>
<xpath expr="//field[@name='target_move']" position="after">
<field name="sort_selection"/>
=== modified file 'account/wizard/account_subscription_generate_view.xml'
--- account/wizard/account_subscription_generate_view.xml 2011-01-14 00:11:01 +0000
+++ account/wizard/account_subscription_generate_view.xml 2012-02-07 15:33:30 +0000
@@ -9,7 +9,7 @@
<field name="arch" type="xml">
<form string="Subscription Compute">
<separator string="Generate Entries before:" colspan="4"/>
- <label string ="Automatically generate entries based on what has been entered in the system before a specific date." colspan="4" nolabel="1"/>
+ <label string ="Automatically generate entries based on what has been entered in the system before a specific date." colspan="4" />
<newline/>
<field name="date"/>
<separator colspan="4" />
=== modified file 'account/wizard/account_vat_view.xml'
--- account/wizard/account_vat_view.xml 2012-02-03 16:26:19 +0000
+++ account/wizard/account_vat_view.xml 2012-02-07 15:33:30 +0000
@@ -9,7 +9,7 @@
<field name="arch" type="xml">
<form string="Taxes Report">
<separator string="Taxes Report" colspan="4"/>
- <label colspan="4" nolabel="1" string="This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
+ <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."/>
<newline/>
<field name="chart_tax_id" widget='selection'/>
<field name="fiscalyear_id"/>
=== modified file 'account_followup/wizard/account_followup_print_view.xml'
--- account_followup/wizard/account_followup_print_view.xml 2012-01-31 13:36:57 +0000
+++ account_followup/wizard/account_followup_print_view.xml 2012-02-07 15:33:30 +0000
@@ -9,7 +9,7 @@
<field name="arch" type="xml">
<form string="Send followups">
<separator string="Send followups" 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" />
<group col="4" colspan="6">
<field name="followup_id"/>
<field name="date"/>
=== modified file 'hr_attendance/wizard/hr_attendance_sign_in_out_view.xml'
--- hr_attendance/wizard/hr_attendance_sign_in_out_view.xml 2011-01-14 00:11:01 +0000
+++ hr_attendance/wizard/hr_attendance_sign_in_out_view.xml 2012-02-07 15:33:30 +0000
@@ -8,7 +8,7 @@
<field name="arch" type="xml">
<form 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" 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/>
<group colspan="4" >
<field name="name" />
=== modified file 'hr_payroll/wizard/hr_payroll_payslips_by_employees.xml'
--- hr_payroll/wizard/hr_payroll_payslips_by_employees.xml 2011-05-26 10:13:04 +0000
+++ hr_payroll/wizard/hr_payroll_payslips_by_employees.xml 2012-02-07 15:33:30 +0000
@@ -8,7 +8,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Payslips by Employees">
- <label colspan="4" nolabel="1" string="This wizard will generate payslips for all selected employee(s) based on the dates and credit note specified on Payslips Run." />
+ <label colspan="4" string="This wizard will generate payslips for all selected employee(s) based on the dates and credit note specified on Payslips Run." />
<group colspan="4" >
<separator string="Employees" colspan="4"/>
<newline/>
=== modified file 'hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml'
--- hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml 2011-01-14 00:11:01 +0000
+++ hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml 2012-02-07 15:33:30 +0000
@@ -8,7 +8,7 @@
<field name="arch" type="xml">
<form 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" 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/>
<group colspan="4" col="6">
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
=== modified file 'import_sugarcrm/wizard/import_message_view.xml'
--- import_sugarcrm/wizard/import_message_view.xml 2011-07-14 15:05:12 +0000
+++ import_sugarcrm/wizard/import_message_view.xml 2012-02-07 15:33:30 +0000
@@ -9,7 +9,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Import Message">
- <label colspan="4" nolabel="1" string="Data are importing, the process is running in the background, an email will be sent to the given email address if it was defined."/>
+ <label colspan="4" string="Data are importing, the process is running in the background, an email will be sent to the given email address if it was defined."/>
<separator string="" colspan="4" />
<button icon="gtk-ok" special="cancel" string="_Ok"/>
</form>
@@ -17,4 +17,4 @@
</record>
</data>
-</openerp>
\ No newline at end of file
+</openerp>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
