@@ -103,19 +101,13 @@
diff --git a/addons/sale/sales_team.py b/addons/sale/sales_team.py
index 4f5c29acad5..7e071b03c62 100644
--- a/addons/sale/sales_team.py
+++ b/addons/sale/sales_team.py
@@ -12,22 +12,6 @@ from openerp.tools.float_utils import float_repr
class crm_team(osv.Model):
_inherit = 'crm.team'
- def _get_sale_orders_data(self, cr, uid, ids, field_name, arg, context=None):
- obj = self.pool['sale.order']
- month_begin = date.today().replace(day=1)
- date_begin = (month_begin - relativedelta.relativedelta(months=self._period_number - 1)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
- date_end = month_begin.replace(day=calendar.monthrange(month_begin.year, month_begin.month)[1]).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
-
- res = {}
- for id in ids:
- res[id] = {}
- created_domain = [('team_id', '=', id), ('state', '=', 'draft'), ('date_order', '>=', date_begin), ('date_order', '<=', date_end)]
- validated_domain = [('team_id', '=', id), ('state', 'not in', ['draft', 'sent', 'cancel']), ('date_order', '>=', date_begin), ('date_order', '<=', date_end)]
- res[id]['monthly_quoted'] = json.dumps(self.__get_bar_values(cr, uid, obj, created_domain, ['amount_total', 'date_order'], 'amount_total', 'date_order', context=context))
- res[id]['monthly_confirmed'] = json.dumps(self.__get_bar_values(cr, uid, obj, validated_domain, ['amount_total', 'date_order'], 'amount_total', 'date_order', context=context))
-
- return res
-
def _get_invoices_data(self, cr, uid, ids, field_name, arg, context=None):
obj = self.pool['account.invoice.report']
month_begin = date.today().replace(day=1)
@@ -52,12 +36,6 @@ class crm_team(osv.Model):
'invoiced_target': fields.integer(string='Invoice Target',
help="Target of invoice revenue for the current month. This is the amount the sales \n"
"team estimates to be able to invoice this month."),
- 'monthly_quoted': fields.function(_get_sale_orders_data,
- type='char', readonly=True, multi='_get_sale_orders_data',
- string='Rate of created quotation per duration'),
- 'monthly_confirmed': fields.function(_get_sale_orders_data,
- type='char', readonly=True, multi='_get_sale_orders_data',
- string='Rate of validate sales orders per duration'),
'monthly_invoiced': fields.function(_get_invoices_data,
type='char', readonly=True,
string='Rate of sent invoices per duration'),
diff --git a/addons/sale/sales_team_view.xml b/addons/sale/sales_team_view.xml
index a44b4ad169e..6dfb23ccdb6 100644
--- a/addons/sale/sales_team_view.xml
+++ b/addons/sale/sales_team_view.xml
@@ -26,8 +26,6 @@
-
-
@@ -36,31 +34,19 @@
@@ -73,7 +59,7 @@