From fb9af9f8bb641ec7643a031f85ff3ce8c36a62ba Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Wed, 24 Oct 2012 15:09:25 +0200 Subject: [FIX] sale_margin: error in yaml test bzr revid: qdp-launchpad@openerp.com-20121024130925-k431qqhmpx5aok20 --- addons/analytic/analytic.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'addons/analytic/analytic.py') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 5ea8c59b848..65505a2884e 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -305,8 +305,15 @@ class account_analytic_line(osv.osv): 'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), } + + def _get_default_datum(self, cr, uid, context=None): + import pprint; PP = pprint.PrettyPrinter() + import pdb; pdb.set_trace() + print 'dans analytic' + return fields.date.context_today() + _defaults = { - 'date': lambda *a: time.strftime('%Y-%m-%d'), + 'date': _get_default_datum, 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c), 'amount': 0.00 } -- cgit v1.2.3 From 1ab9b0449383741c5d3c837b8f1091d2a64a32c2 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Wed, 24 Oct 2012 19:06:01 +0200 Subject: [FIX] the full name building of analytic accounts bzr revid: abo@openerp.com-20121024170601-ccjc2mrhmgn8ydxy --- addons/analytic/analytic.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'addons/analytic/analytic.py') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 5ea8c59b848..11634dc4fb7 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -96,9 +96,22 @@ class account_analytic_account(osv.osv): res[row['id']][field] = row[field] return self._compute_level_tree(cr, uid, ids, child_ids, res, fields, context) - def _complete_name_calc(self, cr, uid, ids, prop, unknow_none, unknow_dict): - res = self.name_get(cr, uid, ids) - return dict(res) + def _get_full_name(self, cr, uid, ids, name=None, args=None, context=None): + if context == None: + context = {} + res = {} + for m in self.browse(cr, uid, ids, context=context): + res[m.id] = self._get_one_full_name(m) + return res + + def _get_one_full_name(self, menu, level=6): + if level<=0: + return '...' + if menu.parent_id: + parent_path = self._get_one_full_name(menu.parent_id, level-1) + "/" + else: + parent_path = '' + return parent_path + menu.name def _child_compute(self, cr, uid, ids, name, arg, context=None): result = {} @@ -139,7 +152,7 @@ class account_analytic_account(osv.osv): _columns = { 'name': fields.char('Account/Contract Name', size=128, required=True), - 'complete_name': fields.function(_complete_name_calc, type='char', string='Full Account Name'), + 'complete_name': fields.function(_get_full_name, type='char', string='Full Account Name'), 'code': fields.char('Reference', size=24, select=True), 'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Project')], 'Type of Account', required=True, help="If you select the View Type, it means you won\'t allow to create journal entries using that account.\n"\ -- cgit v1.2.3 From eeec8c2f89bbd5849d32eef43daf93090cf01ccb Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Thu, 25 Oct 2012 15:53:59 +0200 Subject: [IMP] define a name_get() that includes the complete hierarchy of analytic accounts also improve code style (var names) bzr revid: abo@openerp.com-20121025135359-1b1xhqznmkx8p07z --- addons/analytic/analytic.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'addons/analytic/analytic.py') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 11634dc4fb7..3b9bd94ac22 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -96,22 +96,29 @@ class account_analytic_account(osv.osv): res[row['id']][field] = row[field] return self._compute_level_tree(cr, uid, ids, child_ids, res, fields, context) + def name_get(self, cr, uid, ids, context=None): + res = [] + for id in ids: + elmt = self.browse(cr, uid, id, context=context) + res.append((id, self._get_one_full_name(elmt))) + return res + def _get_full_name(self, cr, uid, ids, name=None, args=None, context=None): if context == None: context = {} res = {} - for m in self.browse(cr, uid, ids, context=context): - res[m.id] = self._get_one_full_name(m) + for elmt in self.browse(cr, uid, ids, context=context): + res[elmt.id] = self._get_one_full_name(elmt) return res - def _get_one_full_name(self, menu, level=6): + def _get_one_full_name(self, elmt, level=6): if level<=0: return '...' - if menu.parent_id: - parent_path = self._get_one_full_name(menu.parent_id, level-1) + "/" + if elmt.parent_id: + parent_path = self._get_one_full_name(elmt.parent_id, level-1) + "/" else: parent_path = '' - return parent_path + menu.name + return parent_path + elmt.name def _child_compute(self, cr, uid, ids, name, arg, context=None): result = {} -- cgit v1.2.3 From 149451bdf5d2f4d097dad948c3a5b329df27ff00 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 25 Oct 2012 16:54:43 +0200 Subject: [FIX] hr_timesheet_sheet: default date on timehseet lines should be the date_from of the timesheet if today isn't included in the date_from and date_to bzr revid: qdp-launchpad@openerp.com-20121025145443-5iuohn57h6uxn04t --- addons/analytic/analytic.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'addons/analytic/analytic.py') diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 65505a2884e..39506c63958 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -306,14 +306,14 @@ class account_analytic_line(osv.osv): } - def _get_default_datum(self, cr, uid, context=None): - import pprint; PP = pprint.PrettyPrinter() - import pdb; pdb.set_trace() - print 'dans analytic' - return fields.date.context_today() + def _get_default_date(self, cr, uid, context=None): + return fields.date.context_today(self, cr, uid, context=context) + + def __get_default_date(self, cr, uid, context=None): + return self._get_default_date(cr, uid, context=context) _defaults = { - 'date': _get_default_datum, + 'date': __get_default_date, 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c), 'amount': 0.00 } -- cgit v1.2.3