From 11edf8df8a09057ee9b5d90cccc6f128864a51a6 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Tue, 15 May 2012 17:15:38 +0530 Subject: [PATCH 001/124] [IMP] change HR Menu bzr revid: kjo@tinyerp.com-20120515114538-cja1xnu64scpm0um --- addons/hr/hr_view.xml | 2 +- .../wizard/hr_attendance_sign_in_out_view.xml | 36 ------------------- addons/hr_evaluation/hr_evaluation_view.xml | 2 +- .../hr_holidays_summary_department_view.xml | 4 +-- addons/hr_recruitment/hr_recruitment_menu.xml | 2 +- .../hr_timesheet_print_employee_view.xml | 2 +- .../wizard/hr_timesheet_print_users_view.xml | 2 +- .../hr_timesheet_analytic_profit_view.xml | 2 +- 8 files changed, 7 insertions(+), 45 deletions(-) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 4147ebc30a9..32032cdadaa 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -312,7 +312,7 @@ + parent="hr.menu_hr_configuration" sequence="1" groups="base.group_no_one"/> Categories Structure diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml index 13ce91c79d4..a37ec4275d5 100644 --- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml +++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml @@ -1,29 +1,6 @@ - - hr.sign.in.out.form - hr.sign.in.out - form - -
- -
From bc6de08dad3ff6fdb3f91c450503a5e269e088ee Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 12 Jun 2012 15:44:55 +0200 Subject: [PATCH 072/124] [FIX] Hide pager in form select popups bzr revid: fme@openerp.com-20120612134455-vqofc8nkyu3i0chq --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index bbb412da384..0ccaf77c809 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2040,7 +2040,7 @@ line-height: 16px; } .openerp .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager { - display: none; + display: none !important; } .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 350b9382d94..e6e48089733 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1648,7 +1648,7 @@ $colour4: #8a89ba height: auto line-height: 16px .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager - display: none + display: none !important // }}} // FormView.one2many {{{ From f9b3e87ddf7f307e167f7d78a24250a639511784 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 12 Jun 2012 16:10:26 +0200 Subject: [PATCH 073/124] [FIX] hr_holiday: fix current leave element in kanban view of employee bzr revid: rco@openerp.com-20120612141026-ygrcbfy6yfy19iw9 --- addons/hr/hr_view.xml | 2 +- addons/hr_holidays/hr_holidays_view.xml | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 5775e672021..ca25007968c 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -145,7 +145,7 @@

()

  • - +
    • diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index e9d4274a2df..76b9ac992ab 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -505,16 +505,19 @@ + - - - + +
  • + - +
    • From 357db69ff878ff706005c0cef1b62a62f94a253c Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 12 Jun 2012 16:17:36 +0200 Subject: [PATCH 074/124] [IMP] hr_holiday: remove hidden fields from form view bzr revid: rco@openerp.com-20120612141736-wh9bjxjzs2ep6obr --- addons/hr_holidays/hr_holidays_view.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 76b9ac992ab..3cb0d90bf5e 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -493,8 +493,6 @@ - - From 15e2795879915cd5c9a0b01d86f0739bd449f1ee Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 12 Jun 2012 16:28:08 +0200 Subject: [PATCH 075/124] [IMP] hr, hr_holiday: put last_login and leave_type together in employee kanban bzr revid: rco@openerp.com-20120612142808-bkm8hbgnw44cwh15 --- addons/hr/hr_view.xml | 4 ++-- addons/hr_holidays/hr_holidays_view.xml | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index ca25007968c..8117ec92965 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -144,8 +144,8 @@

    ()

      -
    • - +
    • +
      • diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 3cb0d90bf5e..62223922163 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -508,14 +508,12 @@ - -
    • - - - -
      • + + + +       From f1716c0e3579c1eb7eba3d141b5580154ed23165 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 12 Jun 2012 19:14:59 +0200 Subject: [PATCH 076/124] [IMP] improved comment TODO bzr revid: fp@tinyerp.com-20120612171459-74dh9ik7yju2mum5 --- openerp/addons/base/ir/ir_ui_view.py | 1 + 1 file changed, 1 insertion(+) diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py index ac1fc5c1129..4d7b0f45d06 100644 --- a/openerp/addons/base/ir/ir_ui_view.py +++ b/openerp/addons/base/ir/ir_ui_view.py @@ -107,6 +107,7 @@ class view(osv.osv): for view in self.browse(cr, uid, ids, context): # RNG-based validation is not possible anymore with 7.0 forms # TODO 7.0: provide alternative assertion-based validation! + # TODO 7.0: and do the tests on the result of fields_view_get instead of each arch. view_docs = [etree.fromstring(view.arch.encode('utf8'))] if view_docs[0].tag == 'data': # A element is a wrapper for multiple root nodes From 940cf37e4f5be5bef535a9eb9b5aa147bce92654 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 12 Jun 2012 19:17:53 +0200 Subject: [PATCH 077/124] [IMP] When you configure OpenERP, you need a full control on how to display the footer and bank accounts bzr revid: fp@tinyerp.com-20120612171753-rhp9iq8y2c53puhe --- openerp/addons/base/res/res_company.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py index 7778f6a055a..2454f342436 100644 --- a/openerp/addons/base/res/res_company.py +++ b/openerp/addons/base/res/res_company.py @@ -88,17 +88,6 @@ class res_company(osv.osv): return result - def _get_bank_data(self, cr, uid, ids, field_names, arg, context=None): - """ Read the 'address' functional fields. """ - result = {} - for company in self.browse(cr, uid, ids, context=context): - r = [] - for bank in company.bank_ids: - if bank.footer: - r.append(bank.name_get(context=context)[0][1]) - result[company.id] = ' | '.join(r) - return result - def _set_address_data(self, cr, uid, company_id, name, value, arg, context=None): """ Write the 'address' functional fields. """ company = self.browse(cr, uid, company_id, context=context) @@ -120,7 +109,7 @@ class res_company(osv.osv): 'partner_id': fields.many2one('res.partner', 'Partner', required=True), 'rml_header1': fields.char('Report Header / Company Slogan', size=200, help="Appears by default on the top right corner of your printed documents."), 'rml_footer1': fields.char('General Information Footer', size=200), - 'rml_footer2': fields.function(_get_bank_data, type="char", string='Bank Accounts Footer', size=250, help="This field is computed automatically based on bank accounts defined, having the display on footer checkbox set."), + 'rml_footer2': fields.char('Bank Accounts Footer', size=250, help="Write here your bank accounts for customer payments."), 'rml_header': fields.text('RML Header', required=True), 'rml_header2': fields.text('RML Internal Header', required=True), 'rml_header3': fields.text('RML Internal Header', required=True), From b846d5fec275f5744eda982f015bb2bcb3c8889f Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Thu, 14 Jun 2012 12:01:23 +0200 Subject: [PATCH 078/124] [FIX] account_analytic_analysis: we can't create a view of an external module bzr revid: stw@openerp.com-20120614100123-eq8wpp3t20minf59 --- .../account_analytic_analysis_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index b6803558b62..cd99299665b 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -29,7 +29,7 @@       - + account.analytic.account.invoice.form.inherit account.analytic.account form From d36169b906c08d69acb735d030b7b28c91a7d0b9 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 13 Jun 2012 11:06:57 +0200 Subject: [PATCH 079/124] [REF] Review some form views with the guide lines bzr revid: stw@openerp.com-20120613090657-xfz9vtvqek3znqdr --- addons/account/product_view.xml | 23 +- addons/crm/crm_lead_menu.xml | 21 -- addons/crm/crm_lead_view.xml | 40 +++- addons/crm/crm_meeting_menu.xml | 2 - addons/crm/crm_meeting_view.xml | 105 ++++---- addons/crm/crm_phonecall_menu.xml | 1 - addons/crm/crm_phonecall_view.xml | 54 ++--- addons/crm/crm_view.xml | 10 +- addons/crm/res_partner_view.xml | 21 ++ .../crm_opportunity_to_phonecall_view.xml | 42 ++-- .../crm_partner_to_opportunity_view.xml | 1 - addons/mail/res_partner_view.xml | 4 +- addons/product/product_view.xml | 224 +++++++++--------- addons/sale/sale.py | 2 +- addons/sale/sale_view.xml | 24 +- addons/sale_crm/sale_crm_view.xml | 4 +- addons/sale_crm/wizard/crm_make_sale.py | 8 +- addons/stock/product_view.xml | 28 +-- addons/stock/stock_view.xml | 142 +++++------ 19 files changed, 400 insertions(+), 356 deletions(-) diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml index cd1860b6d98..73bf64893ba 100644 --- a/addons/account/product_view.xml +++ b/addons/account/product_view.xml @@ -9,19 +9,16 @@ - - - - - - - - - - - - - + + + + + + + + + + diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml index 02fc3369041..fd3a398845d 100644 --- a/addons/crm/crm_lead_menu.xml +++ b/addons/crm/crm_lead_menu.xml @@ -40,27 +40,6 @@ - - - - Opportunities crm.lead diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 86a891aae45..d75df3384e3 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -53,6 +53,25 @@ + + + + @@ -74,6 +93,16 @@ on_change="onchange_stage_id(stage_id)"/> +
      +
      +
    - - + diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 0154af26d95..e9e1a668a3f 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -783,62 +783,62 @@ - - - + + + + @@ -1071,7 +1063,6 @@ Uploading ... -