From 78000800c3f7c6965a2a167cd36578c8d4bfbec3 Mon Sep 17 00:00:00 2001 From: "rpa (Open ERP)" Date: Wed, 12 May 2010 19:35:35 +0530 Subject: [PATCH 1/6] [IMP]: partner_infotab: Renamed partner_crm to partner_infotab, Made relation with timesheet lines and partner bzr revid: rpa@tinyerp.com-20100512140535-cu62e5qzbiy1vvyp --- addons/hr_timesheet/hr_timesheet.py | 3 ++- .../__init__.py | 2 +- .../__openerp__.py | 4 ++-- .../partner_infotab.py} | 2 ++ .../partner_infotab_view.xml} | 22 +++++++++---------- .../security/ir.model.access.csv | 0 6 files changed, 18 insertions(+), 15 deletions(-) rename addons/{partner_crm => partner_infotab}/__init__.py (97%) rename addons/{partner_crm => partner_infotab}/__openerp__.py (94%) rename addons/{partner_crm/partner_crm.py => partner_infotab/partner_infotab.py} (91%) rename addons/{partner_crm/partner_crm_view.xml => partner_infotab/partner_infotab_view.xml} (61%) rename addons/{partner_crm => partner_infotab}/security/ir.model.access.csv (100%) diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py index e89d52659f4..25c61483391 100644 --- a/addons/hr_timesheet/hr_timesheet.py +++ b/addons/hr_timesheet/hr_timesheet.py @@ -43,7 +43,8 @@ class hr_analytic_timesheet(osv.osv): _inherits = {'account.analytic.line': 'line_id'} _order = "id desc" _columns = { - 'line_id' : fields.many2one('account.analytic.line', 'Analytic line', ondelete='cascade'), + 'line_id' : fields.many2one('account.analytic.line', 'Analytic line', ondelete='cascade'), + 'partner_id': fields.related('account_id', 'partner_id', type='many2one', string='Partner Id',relation='account.analytic.account',store=True), } def unlink(self, cr, uid, ids, context={}): diff --git a/addons/partner_crm/__init__.py b/addons/partner_infotab/__init__.py similarity index 97% rename from addons/partner_crm/__init__.py rename to addons/partner_infotab/__init__.py index 4dd1f496527..a0a034ec9c5 100644 --- a/addons/partner_crm/__init__.py +++ b/addons/partner_infotab/__init__.py @@ -19,7 +19,7 @@ # ############################################################################## -import partner_crm +import partner_infotab # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/partner_crm/__openerp__.py b/addons/partner_infotab/__openerp__.py similarity index 94% rename from addons/partner_crm/__openerp__.py rename to addons/partner_infotab/__openerp__.py index d5bc49b1e5c..db44ac70762 100644 --- a/addons/partner_crm/__openerp__.py +++ b/addons/partner_infotab/__openerp__.py @@ -21,7 +21,7 @@ { - 'name': 'Detailed info on partner form', + 'name': 'Detailed information on partner form', 'version': '1.0', 'category': 'Generic Modules/Base', 'description': """ @@ -44,7 +44,7 @@ It adds the following fields on the partner form: 'init_xml': [], 'update_xml': [ 'security/ir.model.access.csv', - 'partner_crm_view.xml' + 'partner_infotab_view.xml' ], 'demo_xml': [], 'installable': True, diff --git a/addons/partner_crm/partner_crm.py b/addons/partner_infotab/partner_infotab.py similarity index 91% rename from addons/partner_crm/partner_crm.py rename to addons/partner_infotab/partner_infotab.py index 2162f850115..f448919c2ea 100644 --- a/addons/partner_crm/partner_crm.py +++ b/addons/partner_infotab/partner_infotab.py @@ -33,6 +33,8 @@ class res_partner(osv.osv): 'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices'), 'contract_ids': fields.one2many('account.analytic.account', \ 'partner_id', 'Contracts'), + 'account_line_ids': fields.one2many('hr.analytic.timesheet', \ + 'partner_id', 'Anaylitic account lines '), } res_partner() diff --git a/addons/partner_crm/partner_crm_view.xml b/addons/partner_infotab/partner_infotab_view.xml similarity index 61% rename from addons/partner_crm/partner_crm_view.xml rename to addons/partner_infotab/partner_infotab_view.xml index ab75f5c58ed..8aabbb242e9 100644 --- a/addons/partner_crm/partner_crm_view.xml +++ b/addons/partner_infotab/partner_infotab_view.xml @@ -11,19 +11,19 @@ - - - - + + + - - - - - - - + + + + + + + + diff --git a/addons/partner_crm/security/ir.model.access.csv b/addons/partner_infotab/security/ir.model.access.csv similarity index 100% rename from addons/partner_crm/security/ir.model.access.csv rename to addons/partner_infotab/security/ir.model.access.csv From f8d2111b2a0b5dde776a44c0f8c6c1402455ec5c Mon Sep 17 00:00:00 2001 From: "nch@tinyerp.com" <> Date: Wed, 12 May 2010 19:37:19 +0530 Subject: [PATCH 2/6] [IMP]:account & installer wizards bzr revid: nch@tinyerp.com-20100512140719-tl5gdbqa4egvbpwm --- addons/account/configurable_account_chart.xml | 2 +- addons/account/installer.py | 6 ++++ addons/base_setup/base_setup_data.xml | 36 ++++++++++--------- addons/base_setup/base_setup_installer.xml | 2 +- addons/base_setup/base_setup_todo.xml | 2 +- addons/base_setup/gtk_contact_form.py | 6 ++-- addons/base_setup/gtk_contact_form.xml | 6 ++-- addons/base_setup/installer.py | 6 ++-- addons/hr/hr_installer.xml | 2 +- 9 files changed, 38 insertions(+), 30 deletions(-) diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml index a6b271bedcb..73cb4499e20 100644 --- a/addons/account/configurable_account_chart.xml +++ b/addons/account/configurable_account_chart.xml @@ -154,7 +154,7 @@ 1104 Bank Current Account - other + view diff --git a/addons/account/installer.py b/addons/account/installer.py index 81993908be9..1cbed3cd2a7 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -32,6 +32,11 @@ class account_installer(osv.osv_memory): _name = 'account.installer' _inherit = 'res.config.installer' + def _get_default_accounts(self, cr, uid, context=None): + accounts = [{'acc_name':'Current','account_type':'cash'}, + {'acc_name':'Deposit','account_type':'cash'}] + return accounts + def _get_charts(self, cr, uid, context=None): modules = self.pool.get('ir.module.module') ids = modules.search(cr, uid, [('category_id','=','Account Charts')]) @@ -77,6 +82,7 @@ class account_installer(osv.osv_memory): 'sale_tax':lambda *a:0.0, 'purchase_tax':lambda *a:0.0, 'charts':'configurable', + 'bank_accounts_id':_get_default_accounts } def on_change_start_date(self, cr, uid, id, start_date): diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml index 90d48de5eba..024accc77ce 100644 --- a/addons/base_setup/base_setup_data.xml +++ b/addons/base_setup/base_setup_data.xml @@ -7,23 +7,25 @@ form
- - - - - - - - - - -