diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml index c90ecb28e03..ed6044a6fd6 100644 --- a/addons/crm/board_crm_view.xml +++ b/addons/crm/board_crm_view.xml @@ -4,23 +4,38 @@ CRM Configuration + crm.opportunity.user.graph1 crm.lead.report graph - - + + + - + + + crm.lead.report.graph + crm.lead.report + graph + + + + + + + + + crm.lead form tree,form - [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] + [('user_id','=',uid),('state','=','open'), ('type', '=', 'opportunity')] @@ -31,12 +46,12 @@ [('user_id','=',uid),('state','!=','cancel'),('date','ilike',time.strftime("%Y-%m"))] - + crm.lead.report form graph,tree,form - - [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel')] + + ['&', ('user_id','=',uid), '!' , '&', ('state', '=', 'done'), ('date_closed','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))] @@ -44,7 +59,7 @@ form graph,tree,form - [('user_id','=',uid),('state','!=','pending'),('state','!=','cancel'),('type', '=', 'opportunity')] + ['&', ('state', '=', 'done') , '&', ('create_date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%Y-%m-%d')), ('type', '=', 'opportunity')] @@ -56,8 +71,8 @@ @@ -70,10 +85,10 @@ diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py index dc66d9e3e8b..c0cc0f736b6 100644 --- a/addons/procurement/schedulers.py +++ b/addons/procurement/schedulers.py @@ -31,7 +31,15 @@ class procurement_order(osv.osv): def _procure_confirm(self, cr, uid, ids=None, use_new_cursor=False, context=None): ''' - use_new_cursor: False or the dbname + Call the scheduler to check the procurement order + + @param self: The object pointer + @param cr: The current row, from the database cursor, + @param uid: The current user ID for security checks + @param ids: List of selected IDs + @param use_new_cursor: False or the dbname + @param context: A standard dictionary for contextual values + @return: Dictionary of values ''' if not context: context = {} @@ -126,6 +134,15 @@ class procurement_order(osv.osv): return {} def create_automatic_op(self, cr, uid, context=None): + """ + Create procurement of virtual stock < 0 + + @param self: The object pointer + @param cr: The current row, from the database cursor, + @param uid: The current user ID for security checks + @param context: A standard dictionary for contextual values + @return: Dictionary of values + """ if not context: context = {} product_obj = self.pool.get('product.product') @@ -167,7 +184,16 @@ class procurement_order(osv.osv): def _procure_orderpoint_confirm(self, cr, uid, automatic=False,\ use_new_cursor=False, context=None, user_id=False): ''' + Create procurement based on Orderpoint use_new_cursor: False or the dbname + + @param self: The object pointer + @param cr: The current row, from the database cursor, + @param user_id: The current user ID for security checks + @param context: A standard dictionary for contextual values + @param param: False or the dbname + @return: Dictionary of values + """ ''' if not context: context = {} diff --git a/addons/procurement/scripts/scheduler.py b/addons/procurement/scripts/scheduler.py deleted file mode 100644 index 648da5cdddc..00000000000 --- a/addons/procurement/scripts/scheduler.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -import xmlrpclib - -sock = xmlrpclib.ServerProxy('http://localhost:8069/xmlrpc/wizard') -wiz_id = sock.create('trunk', 1, 'admin', 'procurement.order.compute.all') -sock.execute('trunk', 1, 'admin', wiz_id, {'form': {'po_cycle': 1.0, 'po_lead': 1.0, 'user_id': 3, 'schedule_cycle': 1.0, 'picking_lead': 1.0, 'security_lead': 50.0, 'automatic': False}, 'ids': [], 'report_type': 'pdf', 'model': 'ir.ui.menu', 'id': False}, 'compute', {}) - - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml index 4fada46aeef..05a57126402 100644 --- a/addons/product/product_data.xml +++ b/addons/product/product_data.xml @@ -39,13 +39,13 @@ smaller - hour + Hour smaller - day + Day diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 006d32b8b68..990b093a284 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -252,18 +252,19 @@ + + + + -