diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2011-12-05 15:47:10 +0100 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2011-12-05 15:47:10 +0100 |
| commit | 74b562cc9aef9cc064da371dea9f4a2eb15154b6 (patch) | |
| tree | 3f495bdc0536103786aa3604af23bd969953103c | |
| parent | f247fb7dccda0fad8c82706b2ad914f7367f5eee (diff) | |
[IMP] polish 4 - misc useability improvements from APR
bzr revid: fp@tinyerp.com-20111205144710-fzozm188f1iwrnin
| -rw-r--r-- | addons/account/account_view.xml | 4 | ||||
| -rw-r--r-- | addons/account/report/account_print_invoice.rml | 2 | ||||
| -rw-r--r-- | addons/account_asset/account_asset_view.xml | 12 | ||||
| -rw-r--r-- | addons/account_invoice_layout/report/report_account_invoice_layout.rml | 2 | ||||
| -rw-r--r-- | addons/association/profile_association.xml | 1 | ||||
| -rw-r--r-- | addons/base_setup/base_setup_views.xml | 1 | ||||
| -rw-r--r-- | addons/crm/__openerp__.py | 3 | ||||
| -rw-r--r-- | addons/crm_todo/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/fetchmail/fetchmail_installer_view.xml | 14 | ||||
| -rw-r--r-- | addons/fetchmail/fetchmail_view.xml | 2 | ||||
| -rw-r--r-- | addons/hr_evaluation/board_hr_evaluation_view.xml | 4 | ||||
| -rw-r--r-- | addons/hr_evaluation/hr_evaluation_data.xml | 14 | ||||
| -rw-r--r-- | addons/hr_evaluation/hr_evaluation_installer.xml | 3 | ||||
| -rw-r--r-- | addons/hr_recruitment/__openerp__.py | 2 |
14 files changed, 27 insertions, 39 deletions
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 16cd957a61e..0d664d45d32 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -171,8 +171,8 @@ <field name="user_type" select="1"/> <field name="active" groups="base.group_extended" /> <newline/> - <field name="debit" invisible="context.get('config_invisible', True)"/> - <field name="credit" invisible="context.get('config_invisible', True)"/> + <field name="debit" invisible="context.get('config_invisible', True)" attrs="{'readonly':[('type','=','view')]}"/> + <field name="credit" invisible="context.get('config_invisible', True)" attrs="{'readonly':[('type','=','view')]}"/> <field name="balance" invisible="context.get('config_invisible', True)"/> </group> <notebook colspan="4"> diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml index 9d4f2dbe174..ff2a8e525be 100644 --- a/addons/account/report/account_print_invoice.rml +++ b/addons/account/report/account_print_invoice.rml @@ -194,7 +194,7 @@ <para style="terp_tblheader_General_Centre">Origin</para> </td> <td> - <para style="terp_tblheader_General_Centre">Your Reference</para> + <para style="terp_tblheader_General_Centre">Customer Code</para> </td> </tr> </blockTable> diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index d28579a6c1a..e986ef4bf0d 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -32,11 +32,11 @@ <field name="prorata"/> <field name="open_asset"/> </group> - <group col="2" colspan="2" groups="analytic.group_analytic_accounting"> - <separator string="Analytic information" colspan="4"/> - <newline/> - <field name="account_analytic_id"/> - </group> + <group col="2" colspan="2" groups="analytic.group_analytic_accounting"> + <separator string="Analytic information" colspan="4"/> + <newline/> + <field name="account_analytic_id"/> + </group> <separator string="Notes" colspan="4"/> <field name="note" colspan="4" nolabel="1"/> </form> @@ -317,7 +317,7 @@ <field name="name">Review Asset Categories</field> <field name="res_model">account.asset.category</field> <field name="view_type">form</field> - <field name="view_mode">form</field> + <field name="view_mode">tree,form</field> </record> <record id="asset_category_form_view_todo" model="ir.actions.todo"> diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml index 1c31c4376c5..6a8a286b66c 100644 --- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml +++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml @@ -231,7 +231,7 @@ <para style="terp_tblheader_General_Centre">Origin</para> </td> <td> - <para style="terp_tblheader_General_Centre">Your Reference</para> + <para style="terp_tblheader_General_Centre">Customer Code</para> </td> </tr> </blockTable> diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml index 8ce97cb2e43..5f81769eb1a 100644 --- a/addons/association/profile_association.xml +++ b/addons/association/profile_association.xml @@ -6,7 +6,6 @@ id="base.menu_association" icon="terp-calendar" sequence="9" - groups="base.group_extended" web_icon="images/association.png" web_icon_hover="images/association-hover.png"/> <menuitem name="Configuration" id="base.menu_event_config" parent="base.menu_association" sequence="30" groups="base.group_extended"/> diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml index d3536b10cf1..5a81b5bfccf 100644 --- a/addons/base_setup/base_setup_views.xml +++ b/addons/base_setup/base_setup_views.xml @@ -162,6 +162,7 @@ <field name="view_type">form</field> <field name="view_mode">form</field> <field name="context">{'res_id': user.company_id.id}</field> + <field name="help">Fill in your company data (address, logo, bank accounts) so that it's printed on your reports. You can click on the button 'Preview Header' in order to check the header/footer of PDF documents.</field> </record> <record id="base_setup_company_todo" model="ir.actions.todo"> <field name="action_id" ref="action_base_setup_company"/> diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index a98a0cbc6a4..fd6c7e6222a 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -61,7 +61,8 @@ Creates a dashboard for CRM that includes: 'mail', 'base_calendar', 'resource', - 'board' + 'board', + 'fetchmail' ], 'init_xml': [ 'crm_data.xml', diff --git a/addons/crm_todo/__openerp__.py b/addons/crm_todo/__openerp__.py index 3b870153347..641e37e736b 100644 --- a/addons/crm_todo/__openerp__.py +++ b/addons/crm_todo/__openerp__.py @@ -23,7 +23,7 @@ { 'name': 'To Do List', 'version': '1.0', - 'category': 'Customer Relationship Management', + "category": 'Hidden/Link', 'complexity': "easy", 'description': """ Todo list for CRM leads and opportunities. diff --git a/addons/fetchmail/fetchmail_installer_view.xml b/addons/fetchmail/fetchmail_installer_view.xml index b5bd7df80ca..918b7ecd430 100644 --- a/addons/fetchmail/fetchmail_installer_view.xml +++ b/addons/fetchmail/fetchmail_installer_view.xml @@ -1,19 +1,5 @@ <openerp> <data> - <record model="ir.actions.act_window" id="view_email_server_form_installer"> - <field name="name">Setup Incoming Mail Servers</field> - <field name="type">ir.actions.act_window</field> - <field name="res_model">fetchmail.server</field> - <field name="view_type">form</field> - <field name="view_mode">tree,form</field> - <field name="view_id" eval="False"/> - <field name="help">You can connect OpenERP to your incoming mail server so that documents (leads, tasks, issues, etc) are synchronized automatically with your incoming emails.</field> - </record> - <record id="view_email_server_form_installer_todo" model="ir.actions.todo"> - <field name="action_id" ref="view_email_server_form_installer"/> - <field name="category_id" ref="base.category_sales_management_config"/> - <field name="sequence">4</field> - </record> </data> </openerp> diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index 56b7165ac56..0b9720a7503 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -32,7 +32,7 @@ </group> <notebook colspan="4"> <page string="Server & Login"> - <group col="4" colspan="2" attrs="{'invisible' : [('type', '=', 'local')]}"> + <group col="2" colspan="2" attrs="{'invisible' : [('type', '=', 'local')]}"> <separator string="Server Information" colspan="2"/> <field name="server" colspan="4" attrs="{'required' : [('type', '!=', 'local')]}" /> <field name="port" required="1" attrs="{'required' : [('type', '!=', 'local')]}" /> diff --git a/addons/hr_evaluation/board_hr_evaluation_view.xml b/addons/hr_evaluation/board_hr_evaluation_view.xml index 7f6d3142db5..46daeeff174 100644 --- a/addons/hr_evaluation/board_hr_evaluation_view.xml +++ b/addons/hr_evaluation/board_hr_evaluation_view.xml @@ -2,7 +2,7 @@ <openerp> <data> <record id="act_hr_evaluation_tree" model="ir.actions.act_window"> - <field name="name">My Evaluation Remaining</field> + <field name="name">My Appraisal Remaining</field> <field name="type">ir.actions.act_window</field> <field name="res_model">hr_evaluation.evaluation</field> <field name="view_type">form</field> @@ -18,7 +18,7 @@ <field name="type">form</field> <field name="arch" type="xml"> <xpath expr="/form/board/column" position="inside"> - <action name="%(act_hr_evaluation_tree)d" string="My Evaluation Remaining"/> + <action name="%(act_hr_evaluation_tree)d" string="My Appraisal Remaining"/> </xpath> </field> </record> diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml index ec82292dd84..ec4b46f8a62 100644 --- a/addons/hr_evaluation/hr_evaluation_data.xml +++ b/addons/hr_evaluation/hr_evaluation_data.xml @@ -2,7 +2,7 @@ <openerp> <data noupdate="1"> <record id="survey_2" model="survey"> - <field name="title">Employee Evaluation</field> + <field name="title">Employee Appraisal</field> <field name="max_response_limit">20</field> <field eval="[(6,0,[])]" name="users"/> <field name="type" ref="survey.survey_type1"/> @@ -11,7 +11,7 @@ <field name="state">open</field> </record> <record id="survey_page_1" model="survey.page"> - <field name="title">Employee Evaluation Form</field> + <field name="title">Employee Appraisal Form</field> <field name="survey_id" ref="survey_2"/> <field eval="1" name="sequence"/> </record> @@ -128,7 +128,7 @@ <field eval="0" name="is_require_answer"/> <field name="type">descriptive_text</field> <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field> - <field name="descriptive_text">* The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-evaluation and a starting point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion. + <field name="descriptive_text">* The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-appraisal and a starting point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion. Once the form had been filled, the employee send it to his supervisor. * It is the primary responsibility of the supervisor to gather the necessary input from the appropriate sources of feedback (internal and/or external customers, peers). In case of collaboration with OpenERP SA Belgium, the supervisor must receive completed evaluation form from the employee's Belgian project manager. @@ -204,7 +204,7 @@ Once the form had been filled, the employee send it to his supervisor. <field name="question">Subject</field> <field eval="0" name="is_require_answer"/> <field name="type">matrix_of_choices_only_one_ans</field> - <field name="column_name">Recommendations / Evaluations</field> + <field name="column_name">Recommendations / Appraisals</field> <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field> <field eval="0" name="make_comment_field"/> <field eval="0" name="in_visible_menu_choice"/> @@ -227,7 +227,7 @@ Once the form had been filled, the employee send it to his supervisor. <field name="question">Supervisors only : </field> <field eval="0" name="is_require_answer"/> <field name="type">matrix_of_choices_only_one_ans</field> - <field name="column_name">Recommendations / Evaluations</field> + <field name="column_name">Recommendations / Appraisals</field> <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field> <field eval="0" name="make_comment_field"/> <field eval="0" name="in_visible_menu_choice"/> @@ -1150,7 +1150,7 @@ Once the form had been filled, the employee send it to his supervisor. <record id="hr_evaluation_plan_managersevaluationplan0" model="hr_evaluation.plan"> <field eval="1" name="active"/> <field eval="6" name="month_next"/> - <field name="name">Manager's Evaluation Plan</field> + <field name="name">Manager's Appraisal Plan</field> <field eval="3" name="month_first"/> <field name="company_id" ref="base.main_company"/> </record> @@ -1219,7 +1219,7 @@ Once the form had been filled, the employee send it to his supervisor. <data> <record forcecreate="True" id="ir_cron_scheduler_evaluation" model="ir.cron"> - <field name="name">Run Employee Evaluation</field> + <field name="name">Run Employee Appraisal</field> <field eval="True" name="active" /> <field name="user_id" ref="base.user_root" /> <field name="interval_number">1</field> diff --git a/addons/hr_evaluation/hr_evaluation_installer.xml b/addons/hr_evaluation/hr_evaluation_installer.xml index 842363559a9..10e7773bc62 100644 --- a/addons/hr_evaluation/hr_evaluation_installer.xml +++ b/addons/hr_evaluation/hr_evaluation_installer.xml @@ -2,11 +2,12 @@ <openerp> <data> <record model="ir.actions.act_window" id="action_evaluation_plans_installer"> - <field name="name">Review Evaluation Plans</field> + <field name="name">Review Appraisal Plans</field> <field name="type">ir.actions.act_window</field> <field name="res_model">hr_evaluation.plan</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> + <field name="help">You can define appraisal plans (ex: first interview after 6 months, then every year). Then, each employee can be linked to an appraisal plan so that OpenERP can automatically generate interview requests to managers and/or subordinates.</field> </record> <record id="todo_evaluation_plans_installer" model="ir.actions.todo"> diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py index 4797ef14044..e41d24cf30b 100644 --- a/addons/hr_recruitment/__openerp__.py +++ b/addons/hr_recruitment/__openerp__.py @@ -37,7 +37,7 @@ system to store and search in your CV base. 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'images': ['images/hr_recruitment_analysis.jpeg','images/hr_recruitment_applicants.jpeg'], - 'depends': ['decimal_precision', 'hr', 'survey', 'crm'], + 'depends': ['decimal_precision', 'hr', 'survey', 'crm', 'fetchmail'], 'update_xml': [ 'wizard/hr_recruitment_phonecall_view.xml', 'wizard/hr_recruitment_employee_hired.xml', |
