diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index c4baede4ae5..b376d34c5d9 100644
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -36,14 +36,14 @@
-
+ gantt
-
-
+ gantt
@@ -116,26 +116,27 @@
+ parent="base.menu_base_partner" sequence="3" />
+ action="crm_case_categ_meet" parent="menu_meeting_sale"
+ sequence="1" />
- Meeting Invitations
- ir.actions.act_window
- calendar.attendee
- form
- tree,form
-
+ Meeting Invitations
+ ir.actions.act_window
+ calendar.attendee
+ form
+ tree,form
+ [('ref','like','crm.meeting,')]
- {'default_sent_by_uid': uid}
-
+ {'default_sent_by_uid': uid}
+
+ name="Meeting Invitations" parent="crm.menu_meeting_sale"
+ groups="base.group_extended"
+ sequence="10" action="action_view_attendee_form" />
@@ -145,7 +146,7 @@
tree,calendar,form,gantt
+ eval="[('state','in',('pending','draft','open')),('date','>=',time.strftime('%Y-%m-%d'))]" />
@@ -169,7 +170,7 @@
-
+ gantt
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 7150abc9de6..ad38f746c51 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -88,7 +88,7 @@ class crm_opportunity(osv.osv):
resource_id = False
if opportunity.user_id:
resource_ids = res_obj.search(cr, uid, [('user_id','=',opportunity.user_id.id)])
- resource_id = len(resource_ids) or resource_ids[0]
+ resource_id = len(resource_ids) and resource_ids[0] or False
duration = float(ans.days)
if opportunity.section_id.resource_calendar_id:
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 44b439491e9..92b09919791 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -82,21 +82,19 @@
-
+
+ on_change="onchange_partner_id(partner_id, email_from)" />
+ on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
-
+
-
diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py
index 846aa6bfccc..86d743c5a6d 100644
--- a/addons/stock/__terp__.py
+++ b/addons/stock/__terp__.py
@@ -56,7 +56,6 @@ Thanks to the double entry management, the inventory controlling is powerful and
"wizard/stock_traceability_view.xml",
"wizard/stock_picking_make_view.xml",
"wizard/stock_return_picking_view.xml",
- "wizard/stock_split_move_view.xml",
"stock_workflow.xml",
"stock_incoterms.xml",
"stock_wizard.xml",
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 230819b355e..612da5ba35e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -662,10 +662,6 @@
-
-
-
-
@@ -823,10 +819,6 @@
-
-
-
-
@@ -1020,10 +1012,6 @@
-
-
-
-
@@ -1226,7 +1214,7 @@
-
+
@@ -1443,24 +1431,6 @@
-
- Picking lists
- stock.picking
- ir.actions.act_window
- form
- tree,form,calendar
-
- [('type','=','out')]
- {'contact_display': 'partner',"search_default_available":1}
-
-
-
- tree
-
-
-
-
-
====================================
Reception Picking (By Stock Move)
====================================
diff --git a/addons/stock/wizard/__init__.py b/addons/stock/wizard/__init__.py
index b801260098f..9ce9e7036de 100644
--- a/addons/stock/wizard/__init__.py
+++ b/addons/stock/wizard/__init__.py
@@ -26,7 +26,6 @@ import stock_partial_move
import stock_picking_make
import wizard_replacement
import stock_return_picking
-import stock_split_move
import wizard_ups
import stock_inventory_merge
import stock_inventory_set_stock_zero
diff --git a/addons/stock/wizard/stock_split_move.py b/addons/stock/wizard/stock_split_move.py
deleted file mode 100644
index 0092656f83d..00000000000
--- a/addons/stock/wizard/stock_split_move.py
+++ /dev/null
@@ -1,125 +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 .
-#
-##############################################################################
-
-from osv import osv, fields
-
-class stock_split_move_line(osv.osv_memory):
- _name = 'stock.move.line.split'
- _description = "Split Moves"
-
- def default_get(self, cr, uid, fields, context):
- """
- To get default values for the object.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param fields: List of fields for which we want default values
- @param context: A standard dictionary
- @return: A dictionary which of fields with values.
- """
- res = super(stock_split_move_line, self).default_get(cr, uid, fields, context=context)
- record_id = context and context.get('active_id', False) or False
- pick_obj = self.pool.get('stock.picking')
- pick = pick_obj.browse(cr, uid, record_id)
- for m in [line for line in pick.move_lines]:
- res['move%s'%(m.id)] = m.product_qty
- return res
-
- def view_init(self, cr, uid, fields_list, context=None):
- """
- Creates view dynamically and adding fields at runtime.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param context: A standard dictionary
- @return: New arch of view with new columns.
- """
- res = super(stock_split_move_line, self).view_init(cr, uid, fields_list, context=context)
- record_id = context and context.get('active_id', False) or False
- if record_id:
- pick_obj = self.pool.get('stock.picking')
- try:
- pick = pick_obj.browse(cr, uid, record_id)
- for m in [line for line in pick.move_lines]:
- if 'move%s' % m.id not in self._columns:
- self._columns['move%s' % m.id] = fields.float(string=m.product_id.name)
- except:
- return res
- return res
-
- def fields_view_get(self, cr, uid, view_id=None, view_type='form',
- context=None, toolbar=False, submenu=False):
- """
- Changes the view dynamically
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param context: A standard dictionary
- @return: New arch of view.
- """
- res = super(stock_split_move_line, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
- record_id = context and context.get('active_id', False) or False
- assert record_id,'Active ID not found'
- pick_obj = self.pool.get('stock.picking')
- pick = pick_obj.browse(cr, uid, record_id)
- arch_lst = ['', '')
- res['arch'] = '\n'.join(arch_lst)
- return res
-
- def split_lines(self, cr, uid, ids, context):
- """
- Splits moves in quantity given in the wizard.
- @param self: The object pointer.
- @param cr: A database cursor
- @param uid: ID of the user currently logged in
- @param ids: List of ids selected
- @param context: A standard dictionary
- @return: A dictionary which of fields with values.
- """
- move_obj = self.pool.get('stock.move')
- record_id = context and context.get('active_id', False) or False
- pick_obj = self.pool.get('stock.picking')
- pick = pick_obj.browse(cr, uid, record_id)
- data = self.read(cr, uid, ids[0])
- move_ids = [m.id for m in [line for line in pick.move_lines]]
- for move in move_obj.browse(cr, uid, move_ids):
- quantity = data['move%s' % move.id]
- if 0 < quantity < move.product_qty:
- new_qty = move.product_qty - quantity
- new_uos_qty = new_qty / move.product_qty * move.product_uos_qty
- new_obj = move_obj.copy(cr, uid, move.id, {'product_qty' : new_qty, 'product_uos_qty': new_uos_qty, 'state':move.state})
- uos_qty = quantity / move.product_qty * move.product_uos_qty
- move_obj.write(cr, uid, [move.id], {'product_qty' : quantity, 'product_uos_qty': uos_qty})
- return {}
-
-stock_split_move_line()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock/wizard/stock_split_move_view.xml b/addons/stock/wizard/stock_split_move_view.xml
index de89f83cb32..30816750035 100644
--- a/addons/stock/wizard/stock_split_move_view.xml
+++ b/addons/stock/wizard/stock_split_move_view.xml
@@ -1,17 +1,6 @@
-
-
-
-
- Split Moves
- ir.actions.act_window
- stock.move.line.split
- form
- form
- new
-
-
-
-
+
+
+