Merge lp:~openerp-dev/openobject-addons/trunk-radio-button-tpa into lp:openobject-addons

[Turkesh Patel (openERP)]

[IMP] added radio widget on selection fields

[lp:~openerp-dev/openobject-addons/trunk-radio-button-tpa]

8690. By Sunil Sharma(OpenERP) on 2014-04-28

[MRG]:lp:openobject-addons

8691. By Sunil Sharma(OpenERP) on 2014-05-01

[imp]:improve radio widget for target_move field

8692. By Sunil Sharma(OpenERP) on 2014-05-01

[MRG]:lp:openobject-addons

8693. By Sunil Sharma(OpenERP) on 2014-05-02

[mrg]:lp:openobject-addons

8694. By Sunil Sharma(OpenERP) on 2014-05-16

[mrg]:lp:openobject-addons

Unmerged revisions

8694. By Sunil Sharma(OpenERP) on 2014-05-16

[mrg]:lp:openobject-addons

8693. By Sunil Sharma(OpenERP) on 2014-05-02

[mrg]:lp:openobject-addons

8692. By Sunil Sharma(OpenERP) on 2014-05-01

[MRG]:lp:openobject-addons

8691. By Sunil Sharma(OpenERP) on 2014-05-01

[imp]:improve radio widget for target_move field

8690. By Sunil Sharma(OpenERP) on 2014-04-28

[MRG]:lp:openobject-addons

8689. By Turkesh Patel (openERP) on 2014-04-22

[IMP] improved mistek of resolving conflict by avo

8688. By Turkesh Patel (openERP) on 2014-04-22

[MRG] merge with lp:openobject-addons

8687. By Amit Vora(OpenERP) on 2014-04-16

[IMP] resolve conflict

8686. By Amit Vora(OpenERP) on 2014-04-16

[MRG] merge with main branch

8685. By Turkesh Patel (openERP) on 2014-03-06

[MRG] merge with lp:openobject-addons

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2014-05-02 13:07:53 +0000
+++ account/account_view.xml	2014-05-16 06:39:28 +0000
@@ -1603,7 +1603,7 @@
                 <form string="Payment Term" version="7.0">
                     <group>
                         <group string="Amount Computation">
-	                        <field name="value"/>
+	                        <field name="value" widget="radio" nolabel="1" colspan="4"/>
 	                        <label for="value_amount" string="Amount To Pay"  attrs="{'invisible':[('value','=','balance')]}"/>
 	                        <div attrs="{'invisible':[('value','=','balance')]}">
 	                            <field name="value_amount" class="oe_inline"/>

=== modified file 'account/res_config.py'
--- account/res_config.py	2014-04-23 11:40:53 +0000
+++ account/res_config.py	2014-05-16 06:39:28 +0000
@@ -51,8 +51,8 @@
         'code_digits': fields.integer('# of Digits', help="No. of digits to use for account code"),
         'tax_calculation_rounding_method': fields.related('company_id',
             'tax_calculation_rounding_method', type='selection', selection=[
-            ('round_per_line', 'Round per line'),
-            ('round_globally', 'Round globally'),
+            ('round_per_line', 'Round calculation of taxes per line'),
+            ('round_globally', 'Round globally calculation of taxes '),
             ], string='Tax calculation rounding method',
             help="If you select 'Round per line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
         'sale_tax': fields.many2one("account.tax.template", "Default sale tax"),

=== modified file 'account/res_config_view.xml'
--- account/res_config_view.xml	2014-04-21 05:34:56 +0000
+++ account/res_config_view.xml	2014-05-16 06:39:28 +0000
@@ -115,8 +115,7 @@
                                 <field name="decimal_precision" class="oe_inline"/>
                             </div>
                             <div>
-                                <label for="tax_calculation_rounding_method"/>
-                                <field name="tax_calculation_rounding_method" class="oe_inline"/>
+                                <field name="tax_calculation_rounding_method" widget="radio" class="oe_inline" />
                             </div>
                         </div>
                         <label for="id" string="Features"/>

=== modified file 'account/wizard/account_report_account_balance_view.xml'
--- account/wizard/account_report_account_balance_view.xml	2012-11-29 22:26:45 +0000
+++ account/wizard/account_report_account_balance_view.xml	2014-05-16 06:39:28 +0000
@@ -12,7 +12,7 @@
             <xpath expr="//notebook/page[@string='Journals']" position="replace">
             </xpath>
             <xpath expr="//field[@name='target_move']" position="after">
-                <field name="display_account"/>
+                <field name="display_account" widget="radio"/>
                 <newline/>
             </xpath>
             </data>

=== modified file 'account/wizard/account_report_aged_partner_balance_view.xml'
--- account/wizard/account_report_aged_partner_balance_view.xml	2014-03-19 14:33:46 +0000
+++ account/wizard/account_report_aged_partner_balance_view.xml	2014-05-16 06:39:28 +0000
@@ -19,7 +19,7 @@
                         <newline/>
                         <field name="result_selection"/>
                         <field name="direction_selection"/>
-                        <field name="target_move"/>
+                        <field name="target_move"  widget="radio"/>
                     </group>
                     <field name="journal_ids" required="0" invisible="1"/>
                     <footer>

=== modified file 'account/wizard/account_report_common.py'
--- account/wizard/account_report_common.py	2013-10-27 12:31:04 +0000
+++ account/wizard/account_report_common.py	2014-05-16 06:39:28 +0000
@@ -44,7 +44,7 @@
         'chart_account_id': fields.many2one('account.account', 'Chart of Account', help='Select Charts of Accounts', required=True, domain = [('parent_id','=',False)]),
         'company_id': fields.related('chart_account_id', 'company_id', type='many2one', relation='res.company', string='Company', readonly=True),
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', help='Keep empty for all open fiscal year'),
-        'filter': fields.selection([('filter_no', 'No Filters'), ('filter_date', 'Date'), ('filter_period', 'Periods')], "Filter by", required=True),
+        'filter': fields.selection([('filter_no', 'Do not apply filter'), ('filter_date', 'Filter by date'), ('filter_period', 'Filter by period')], "Filter by", required=True),
         'period_from': fields.many2one('account.period', 'Start Period'),
         'period_to': fields.many2one('account.period', 'End Period'),
         'journal_ids': fields.many2many('account.journal', string='Journals', required=True),

=== modified file 'account/wizard/account_report_common_account.py'
--- account/wizard/account_report_common_account.py	2013-10-27 12:31:04 +0000
+++ account/wizard/account_report_common_account.py	2014-05-16 06:39:28 +0000
@@ -26,8 +26,8 @@
     _description = 'Account Common Account Report'
     _inherit = "account.common.report"
     _columns = {
-        'display_account': fields.selection([('all','All'), ('movement','With movements'),
-                                            ('not_zero','With balance is not equal to 0'),
+        'display_account': fields.selection([('all','Display all Accounts'), ('movement','Display Accounts with movements'),
+                                            ('not_zero','Display Account where balance is not equal to 0'),
                                             ],'Display Accounts', required=True),
 
     }

=== modified file 'account/wizard/account_report_common_view.xml'
--- account/wizard/account_report_common_view.xml	2012-11-29 22:26:45 +0000
+++ account/wizard/account_report_common_view.xml	2014-05-16 06:39:28 +0000
@@ -12,12 +12,12 @@
                    <field name="chart_account_id" widget='selection' on_change="onchange_chart_id(chart_account_id, context)"/>
                    <field name="company_id" invisible="1"/>
                    <field name="fiscalyear_id" domain="[('company_id','=',company_id)]"/>
-                   <field name="target_move"/>
+                   <field name="target_move" widget="radio" nolable="1"/>
                 </group>
                 <notebook tabpos="up" colspan="4">
                     <page string="Filters" name="filters">
-                        <group>
-                            <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)"/>
+                        <group col="4">
+                            <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)" widget="radio" nolabel="1"/>
                         </group>
                         <group string="Dates"  attrs="{'invisible':[('filter', '!=', 'filter_date')], 'required':[('filter', '=', 'filter_date')]}">
                             <field name="date_from" />

=== modified file 'account/wizard/account_report_general_ledger_view.xml'
--- account/wizard/account_report_general_ledger_view.xml	2012-11-29 22:26:45 +0000
+++ account/wizard/account_report_general_ledger_view.xml	2014-05-16 06:39:28 +0000
@@ -9,14 +9,14 @@
             <field name="arch" type="xml">
             <data>
             <xpath expr="//field[@name='target_move']" position="after">
-                <field name="display_account"/>
-                <field name="sortby"/>
+                <field name="display_account" widget="radio"/>
+                <field name="sortby" widget="radio"/>
                 <field name="landscape"/>
                 <field name="amount_currency"/>
                 <newline/>
             </xpath>
             <xpath expr="//field[@name='filter']" position="after">
-                <field name="initial_balance" attrs="{'readonly':[('filter', 'in', ('filter_no'))]}" />
+                <field name="initial_balance" attrs="{'readonly':[('filter', 'in', ('filter_no'))]}"/>
             </xpath>
             </data>
             </field>

=== modified file 'account/wizard/account_report_partner_balance.py'
--- account/wizard/account_report_partner_balance.py	2014-05-02 13:03:10 +0000
+++ account/wizard/account_report_partner_balance.py	2014-05-16 06:39:28 +0000
@@ -30,7 +30,7 @@
     _name = 'account.partner.balance'
     _description = 'Print Account Partner Balance'
     _columns = {
-        'display_partner': fields.selection([('non-zero_balance', 'With balance is not equal to 0'), ('all', 'All Partners')]
+        'display_partner': fields.selection([('non-zero_balance', 'Display partners with balance is not equal to 0'), ('all', 'Display all partners')]
                                     ,'Display Partners'),
         'journal_ids': fields.many2many('account.journal', 'account_partner_balance_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
     }

=== modified file 'account/wizard/account_report_partner_balance_view.xml'
--- account/wizard/account_report_partner_balance_view.xml	2012-11-29 22:26:45 +0000
+++ account/wizard/account_report_partner_balance_view.xml	2014-05-16 06:39:28 +0000
@@ -10,7 +10,7 @@
             <data>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="result_selection"/>
-                <field name="display_partner"/>
+                <field name="display_partner" widget="radio"/>
                 <newline/>
             </xpath>
             </data>

=== modified file 'account/wizard/account_report_print_journal_view.xml'
--- account/wizard/account_report_print_journal_view.xml	2012-11-29 22:26:45 +0000
+++ account/wizard/account_report_print_journal_view.xml	2014-05-16 06:39:28 +0000
@@ -9,7 +9,7 @@
             <field name="arch" type="xml">
             <data>
             <xpath expr="//field[@name='target_move']" position="after">
-                <field name="sort_selection"/>
+                <field name="sort_selection" widget="radio"/>
                 <field name="amount_currency"/>
                 <newline/>
                 <field name="filter" on_change="onchange_filter(filter, fiscalyear_id)" colspan="4" invisible="1"/>

=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py	2014-05-07 13:45:44 +0000
+++ account_asset/account_asset.py	2014-05-16 06:39:28 +0000
@@ -40,7 +40,7 @@
         'account_expense_depreciation_id': fields.many2one('account.account', 'Depr. Expense Account', required=True, domain=[('type','=','other')]),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True),
         'company_id': fields.many2one('res.company', 'Company', required=True),
-        'method': fields.selection([('linear','Linear'),('degressive','Degressive')], 'Computation Method', required=True, help="Choose the method to use to compute the amount of depreciation lines.\n"\
+        'method': fields.selection([('linear','Linear: Computed on basis of Gross Value / Number of Depreciations'),('degressive','Degressive: Computed on basis of Residual Value * Degressive Factor')], 'Computation Method', required=True, help="Choose the method to use to compute the amount of depreciation lines.\n"\
             "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n" \
             "  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"),
         'method_number': fields.integer('Number of Depreciations', help="The number of depreciations needed to depreciate your asset"),
@@ -262,7 +262,7 @@
                                        "You can manually close an asset when the depreciation is over. If the last line of depreciation is posted, the asset automatically goes in that status."),
         'active': fields.boolean('Active'),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True, states={'draft':[('readonly',False)]}),
-        'method': fields.selection([('linear','Linear'),('degressive','Degressive')], 'Computation Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Choose the method to use to compute the amount of depreciation lines.\n"\
+        'method': fields.selection([('linear','Linear: Computed on basis of Gross Value / Number of Depreciations'),('degressive','Degressive: Computed on basis of Residual Value * Degressive Factor')], 'Computation Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Choose the method to use to compute the amount of depreciation lines.\n"\
             "  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n" \
             "  * Degressive: Calculated on basis of: Residual Value * Degressive Factor"),
         'method_number': fields.integer('Number of Depreciations', readonly=True, states={'draft':[('readonly',False)]}, help="The number of depreciations needed to depreciate your asset"),

=== modified file 'account_asset/account_asset_view.xml'
--- account_asset/account_asset_view.xml	2014-03-28 14:06:51 +0000
+++ account_asset/account_asset_view.xml	2014-05-16 06:39:28 +0000
@@ -28,7 +28,7 @@
                         <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
                     </group>
                     <group string="Depreciation Method">
-                        <field name="method"/>
+                        <field name="method" widget="radio"/>
                         <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
                         <field name="prorata"/>
                         <field name="open_asset"/>
@@ -116,7 +116,7 @@
                                     <field name="partner_id"/>
                                 </group>
                                 <group>
-                                    <field name="method"/>
+                                    <field name="method" widget="radio"/>
                                     <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
                                     <label for="method_time"/>
                                     <div>

=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py	2014-05-02 13:03:52 +0000
+++ account_voucher/account_voucher.py	2014-05-16 06:39:28 +0000
@@ -374,8 +374,8 @@
         'pre_line':fields.boolean('Previous Payments ?', required=False),
         'date_due': fields.date('Due Date', readonly=True, select=True, states={'draft':[('readonly',False)]}),
         'payment_option':fields.selection([
-                                           ('without_writeoff', 'Keep Open'),
-                                           ('with_writeoff', 'Reconcile Payment Balance'),
+                                           ('without_writeoff', 'Keep it open'),
+                                           ('with_writeoff', 'Reconcile payment balance'),
                                            ], 'Payment Difference', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="This field helps you to choose what you want to do with the eventual difference between the paid amount and the sum of allocated amounts. You can either choose to keep open this difference on the partner's account, or reconcile it with the payment(s)"),
         'writeoff_acc_id': fields.many2one('account.account', 'Counterpart Account', readonly=True, states={'draft': [('readonly', False)]}),
         'comment': fields.char('Counterpart Comment', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),

=== modified file 'account_voucher/voucher_payment_receipt_view.xml'
--- account_voucher/voucher_payment_receipt_view.xml	2013-10-27 12:31:04 +0000
+++ account_voucher/voucher_payment_receipt_view.xml	2014-05-16 06:39:28 +0000
@@ -211,13 +211,15 @@
                                     <group col="2">
                                         <separator string="Payment Options" colspan="2"/>
                                         <field name="writeoff_amount" widget='monetary' options='{"currency_field": "currency_id"}'/>
-                                        <field name="payment_option" required="1"/>
+                                        <label for="payment_option" string="Difference of payment amount" class="oe_inline"/>
+                                        <field name="payment_option" widget="radio" required="1" nolabel="1"/>
                                         <field name="writeoff_acc_id"
                                                attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
                                                domain="[('type','=','other')]"/>
                                         <field name="comment"
                                                attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
                                         <field name="analytic_id"
+                                               attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"
                                                groups="analytic.group_analytic_accounting"/>
                                     </group>
                                 </group>
@@ -495,7 +497,7 @@
                                 </group>
                                 <group>
                                     <field name="writeoff_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                                    <field name="payment_option" required="1" attrs="{'invisible':[('writeoff_amount','=',0)]}"/>
+                                    <field name="payment_option" required="1" widget="radio" attrs="{'invisible':[('writeoff_amount','=',0)]}"/>
                                     <field name="writeoff_acc_id"
                                            attrs="{'invisible':['|', ('payment_option','!=','with_writeoff'), ('writeoff_amount','=',0)], 'required':[('payment_option','=','with_writeoff')]}"
                                            domain="[('type','=','other')]"/>

=== modified file 'analytic/analytic_view.xml'
--- analytic/analytic_view.xml	2014-04-01 12:36:57 +0000
+++ analytic/analytic_view.xml	2014-05-16 06:39:28 +0000
@@ -26,8 +26,8 @@
                                 <field name="currency_id" attrs="{'invisible': ['|',('type', '&lt;&gt;', 'view'), ('company_id', '&lt;&gt;', False)]}"/>
                             </group>
                             <group>
-                                <field name="type" invisible="context.get('default_type', False)"/>
-                                <field name="template_id" on_change="on_change_template(template_id, date_start)" domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
+                                <field name="type" invisible="context.get('default_type', False)" widget="radio"/>
+                                <field name="template_id" on_change="on_change_template(template_id,date_start)" domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
                                 <field name="code"/>
                                 <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract'])]}"/>
                                 <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>

=== modified file 'calendar/calendar.py'
--- calendar/calendar.py	2014-05-14 08:28:10 +0000
+++ calendar/calendar.py	2014-05-16 06:39:28 +0000
@@ -869,7 +869,8 @@
         'stop_datetime': fields.datetime('End Datetime', states={'done': [('readonly', True)]}, track_visibility='onchange'),  # old date_deadline
         'duration': fields.float('Duration', states={'done': [('readonly', True)]}),
         'description': fields.text('Description', states={'done': [('readonly', True)]}),
-        'class': fields.selection([('public', 'Public'), ('private', 'Private'), ('confidential', 'Public for Employees')], 'Privacy', states={'done': [('readonly', True)]}),
+        'class': fields.selection([('public', 'Everyone'), ('private', 'Only me'), \
+             ('confidential', 'Only internal users')], 'Privacy', states={'done': [('readonly', True)]}),
         'location': fields.char('Location', help="Location of Event", track_visibility='onchange', states={'done': [('readonly', True)]}),
         'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], 'Show Time as', states={'done': [('readonly', True)]}),
 

=== modified file 'calendar/calendar_view.xml'
--- calendar/calendar_view.xml	2014-05-05 15:42:46 +0000
+++ calendar/calendar_view.xml	2014-05-16 06:39:28 +0000
@@ -127,7 +127,7 @@
                                     </group>
                                 </group>
                                 <group>
-                                    <field name="class"/>
+                                    <field name="class" widget="radio"/>
                                     <field name="show_as"/>
                                     <field name="rrule" invisible="1" readonly="0" />                                    
                                     <field name="recurrent_id" invisible="1" />

=== modified file 'mail/mail_group.py'
--- mail/mail_group.py	2014-03-20 15:08:55 +0000
+++ mail/mail_group.py	2014-05-16 06:39:28 +0000
@@ -48,7 +48,7 @@
         'name': fields.char('Name', size=64, required=True, translate=True),
         'description': fields.text('Description'),
         'menu_id': fields.many2one('ir.ui.menu', string='Related Menu', required=True, ondelete="cascade"),
-        'public': fields.selection([('public', 'Public'), ('private', 'Private'), ('groups', 'Selected Group Only')], 'Privacy', required=True,
+        'public': fields.selection([('public', 'Everyone'), ('private', 'Invited people only'), ('groups', 'Selected group of users')], 'Privacy', required=True,
             help='This group is visible by non members. \
             Invisible groups can add members through the invite button.'),
         'group_public_id': fields.many2one('res.groups', string='Authorized Group'),

=== modified file 'mail/mail_group_view.xml'
--- mail/mail_group_view.xml	2013-10-27 12:31:04 +0000
+++ mail/mail_group_view.xml	2014-05-16 06:39:28 +0000
@@ -95,7 +95,7 @@
                         <field name="description" placeholder="Topics discussed in this group..."/>
                         <div class="oe_clear"/>
                         <group class="oe_edit_only">
-                            <field name="public"/>
+                            <field name="public" widget="radio" string="Who can follow the group's activities?"/>
                             <field name="group_public_id"
                                 attrs="{'invisible': [('public','&lt;&gt;','groups')], 'required': [('public','=','groups')]}"
                                 />

=== modified file 'mail/tests/test_mail_features.py'
--- mail/tests/test_mail_features.py	2014-04-17 09:41:33 +0000
+++ mail/tests/test_mail_features.py	2014-05-16 06:39:28 +0000
@@ -862,7 +862,7 @@
         # Test: first produced message: no subtype, name change tracked
         last_msg = self.group_pigs.message_ids[-1]
         self.assertFalse(last_msg.subtype_id, 'tracked: message should not have been linked to a subtype')
-        self.assertIn(u'SelectedGroupOnly\u2192Public', _strip_string_spaces(last_msg.body), 'tracked: message body incorrect')
+        self.assertIn(u"Selectedgroupofusers\u2192Everyone", _strip_string_spaces(last_msg.body), 'tracked: message body incorrect')
         self.assertIn('Pigs', _strip_string_spaces(last_msg.body), 'tracked: message body does not hold always tracked field')
 
         # Test: change name as supername, public as private -> 2 subtypes
@@ -878,7 +878,7 @@
         last_msg = self.group_pigs.message_ids[-3]
         self.assertEqual(last_msg.subtype_id.id, mt_name_supername_id, 'tracked: message should be linked to mt_name_supername subtype')
         self.assertIn('Supername name', last_msg.body, 'tracked: message body does not hold the subtype description')
-        self.assertIn(u'Public\u2192Private', _strip_string_spaces(last_msg.body), 'tracked: message body incorrect')
+        self.assertIn(u"Everyone\u2192Invitedpeopleonly", _strip_string_spaces(last_msg.body), 'tracked: message body incorrect')
         self.assertIn(u'Pigs\u2192supername', _strip_string_spaces(last_msg.body), 'tracked feature: message body does not hold always tracked field')
 
         # Test: change public as public, group_public_id -> 2 subtypes, name always tracked
@@ -889,13 +889,13 @@
         last_msg = self.group_pigs.message_ids[-4]
         self.assertEqual(last_msg.subtype_id.id, mt_group_public_set_id, 'tracked: message should be linked to mt_group_public_set_id')
         self.assertIn('Group set', last_msg.body, 'tracked: message body does not hold the subtype description')
-        self.assertIn(u'Private\u2192Public', _strip_string_spaces(last_msg.body), 'tracked: message body does not hold changed tracked field')
+        self.assertIn(u"Invitedpeopleonly\u2192Everyone", _strip_string_spaces(last_msg.body), 'tracked: message body does not hold changed tracked field')
         self.assertIn(u'HumanResources/Employee\u2192Administration/Settings', _strip_string_spaces(last_msg.body), 'tracked: message body does not hold always tracked field')
         # Test: second produced message: mt_group_public_id, with name always tracked, public tracked on change
         last_msg = self.group_pigs.message_ids[-5]
         self.assertEqual(last_msg.subtype_id.id, mt_group_public_id, 'tracked: message should be linked to mt_group_public_id')
         self.assertIn('Group changed', last_msg.body, 'tracked: message body does not hold the subtype description')
-        self.assertIn(u'Private\u2192Public', _strip_string_spaces(last_msg.body), 'tracked: message body does not hold changed tracked field')
+        self.assertIn(u"Invitedpeopleonly\u2192Everyone", _strip_string_spaces(last_msg.body), 'tracked: message body does not hold changed tracked field')
         self.assertIn(u'HumanResources/Employee\u2192Administration/Settings', _strip_string_spaces(last_msg.body), 'tracked: message body does not hold always tracked field')
 
         # Test: change group_public_id to False -> 1 subtype, name always tracked

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2014-05-08 11:59:17 +0000
+++ mrp/mrp.py	2014-05-16 06:39:28 +0000
@@ -196,7 +196,7 @@
         'name': fields.char('Name', size=64),
         'code': fields.char('Reference', size=16),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the bills of material without removing it."),
-        'type': fields.selection([('normal', 'Normal BoM'), ('phantom', 'Sets / Phantom')], 'BoM Type', required=True,
+        'type': fields.selection([('normal','Manufacture this product as a normal bill of material'),('phantom','Sell and ship this product as a set of components(phantom)')], 'BoM Type', required=True,
                                  help= "If a by-product is used in several products, it can be useful to create its own BoM. "\
                                  "Though if you don't want separated production orders for this by-product, select Set/Phantom as BoM type. "\
                                  "If a Phantom BoM is used for a root product, it will be sold and shipped as a set of components, instead of being produced."),

=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml	2014-05-07 18:29:17 +0000
+++ mrp/mrp_view.xml	2014-05-16 06:39:28 +0000
@@ -368,7 +368,7 @@
                         <group>
                             <field name="name" groups="product.group_mrp_properties"/>
                             <field name="code" string="Reference"/>
-                            <field name="type"/>
+                            <field name="type" widget="radio"/>
                             <p colspan="2" class="oe_grey" attrs="{'invisible': [('type','=','normal')]}">
                                 When processing a sales order for this product, the delivery order
                                 will contain the raw materials, instead of the finished product.

=== modified file 'purchase/res_config.py'
--- purchase/res_config.py	2014-04-15 11:29:15 +0000
+++ purchase/res_config.py	2014-05-16 06:39:28 +0000
@@ -28,9 +28,9 @@
 
     _columns = {
         'default_invoice_method': fields.selection(
-            [('manual', 'Based on purchase order lines'),
-             ('picking', 'Based on incoming shipments'),
-             ('order', 'Pre-generate draft invoices based on purchase orders'),
+            [('manual', 'Control supplier invoice on purchase order line'),
+             ('picking', 'Control supplier invoice on incoming shipments'),
+             ('order', 'Control supplier invoice on a pregenerated draft invoice'),
             ], 'Default invoicing control method', required=True, default_model='purchase.order'),
         'group_purchase_pricelist':fields.boolean("Manage pricelist per supplier",
             implied_group='product.group_purchase_pricelist',

=== modified file 'purchase/res_config_view.xml'
--- purchase/res_config_view.xml	2013-12-03 13:44:48 +0000
+++ purchase/res_config_view.xml	2014-05-16 06:39:28 +0000
@@ -25,12 +25,9 @@
                     </header>
                     <separator string="Invoicing Process"/>
                     <group>
-                        <label for="id" string="Invoicing Settings"/>
+                        <label for="id" string="Default Invoicing Settings"/>
                         <div>
-                            <div>
-                                <label for="default_invoice_method"/>
-                                <field name="default_invoice_method" class="oe_inline"/>
-                            </div>
+                            <field name="default_invoice_method" widget="radio" class="oe_inline"/>
                         </div>
                     </group>
                     <separator string="Purchase Order"/>

=== modified file 'sale_stock/res_config.py'
--- sale_stock/res_config.py	2014-05-08 14:39:40 +0000
+++ sale_stock/res_config.py	2014-05-16 06:39:28 +0000
@@ -37,7 +37,7 @@
                  'and to automatically creates project tasks from procurement lines.\n'
                  '-This installs the modules project_timesheet and project_mrp.'),
         'default_order_policy': fields.selection(
-            [('manual', 'Invoice based on sales orders'), ('picking', 'Invoice based on deliveries')],
+            [('manual', 'Create invoice on sales order'), ('picking', 'Create invoice on deliveries')],
             'The default invoicing method is', default_model='sale.order',
             help="You can generate invoices based on sales orders or based on shippings."),
         'module_delivery': fields.boolean('Allow adding shipping costs',

=== modified file 'sale_stock/res_config_view.xml'
--- sale_stock/res_config_view.xml	2014-04-14 09:47:43 +0000
+++ sale_stock/res_config_view.xml	2014-05-16 06:39:28 +0000
@@ -28,8 +28,7 @@
                      </xpath>
                      <xpath expr="//div[@name='time_unit']" position="before">
                          <div attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}">
-                             <label for="default_order_policy"/>
-                             <field name="default_order_policy" class="oe_inline"/>
+                             <field name="default_order_policy" class="oe_inline" widget="radio"/>
                          </div>
                          <div>
                              <field name="module_delivery" class="oe_inline"/>
@@ -71,4 +70,4 @@
              </field>
          </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>