[MERGE] misc fixes, addons10

bzr revid: fp@tinyerp.com-20120926070743-wx6359lr50focv15

addons/crm/crm_view.xml

@@ -446,13 +446,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        
-        <menuitem id="menu_crm_payment_mode" name="Fund Raising"
-            parent="base.menu_base_config" sequence="85" groups="crm.group_fund_raising"/>
             
         <menuitem action="action_crm_payment_mode"
             id="menu_crm_payment_mode_act"
+            groups="base.group_no_one"
             name="Payment Modes"
-            parent="menu_crm_payment_mode" />
+            parent="base.menu_crm_config_lead" />
     </data>
 </openerp>

addons/portal_project_issue/portal_project_issue_view.xml

@@ -5,6 +5,7 @@
         <record id="portal_project_issue_kanban_view" model="ir.ui.view">
             <field name="name">Project Issue Kanban</field>
             <field name="model">project.issue</field>
+            <field name="priority">20</field>
             <field name="arch" type="xml">
                 <kanban version="7.0" class="oe_portal_project_issue">
                     <field name="priority"/>

addons/project/project_view.xml

@@ -104,7 +104,7 @@
                     <notebook>
                         <page string="Team" name="team">
                             <field colspan="4" name="members" widget="many2many_kanban">
-                                <kanban quick_create="true" create="false">
+                                <kanban quick_create="false" create="true">
                                     <field name="name"/>
                                     <templates>
                                         <t t-name="kanban-box">

addons/warning/warning.py

@@ -174,6 +174,60 @@ class stock_picking(osv.osv):
 
 stock_picking()
 
+# FIXME:(class stock_picking_in and stock_picking_out) this is a temporary workaround because of a framework bug (ref: lp:996816). 
+# It should be removed as soon as the bug is fixed
+class stock_picking_in(osv.osv):
+    _inherit = 'stock.picking.in'
+
+    def onchange_partner_in(self, cr, uid, context, partner_id=None):
+        if not partner_id:
+            return {}
+        partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+        warning = {}
+        title = False
+        message = False
+        if partner.picking_warn != 'no-message':
+            if partner.picking_warn == 'block':
+                raise osv.except_osv(_('Alert for %s !') % (partner.name), partner.picking_warn_msg)
+            title = _("Warning for %s") % partner.name
+            message = partner.picking_warn_msg
+            warning = {
+                'title': title,
+                'message': message
+            }
+        result =  super(stock_picking_in, self).onchange_partner_in(cr, uid, context, partner_id)
+        if result.get('warning',False):
+            warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
+            warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
+
+        return {'value': result.get('value',{}), 'warning':warning}
+
+class stock_picking_out(osv.osv):
+    _inherit = 'stock.picking.out'
+
+    def onchange_partner_in(self, cr, uid, context, partner_id=None):
+        if not partner_id:
+            return {}
+        partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+        warning = {}
+        title = False
+        message = False
+        if partner.picking_warn != 'no-message':
+            if partner.picking_warn == 'block':
+                raise osv.except_osv(_('Alert for %s !') % (partner.name), partner.picking_warn_msg)
+            title = _("Warning for %s") % partner.name
+            message = partner.picking_warn_msg
+            warning = {
+                'title': title,
+                'message': message
+            }
+        result =  super(stock_picking_out, self).onchange_partner_in(cr, uid, context, partner_id)
+        if result.get('warning',False):
+            warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
+            warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
+
+        return {'value': result.get('value',{}), 'warning':warning}
+
 class product_product(osv.osv):
     _inherit = 'product.product'
     _columns = {
@@ -228,8 +282,8 @@ sale_order_line()
 
 class purchase_order_line(osv.osv):
     _inherit = 'purchase.order.line'
-    def product_id_change(self,cr, uid, ids, pricelist, product, qty, uom,
-            partner_id, date_order=False, fiscal_position=False, date_planned=False,
+    def onchange_product_id(self,cr, uid, ids, pricelist, product, qty, uom,
+            partner_id, date_order=False, fiscal_position_id=False, date_planned=False,
             name=False, price_unit=False, notes=False, context=None):
         warning = {}
         if not product:
@@ -247,8 +301,8 @@ class purchase_order_line(osv.osv):
             warning['title'] = title
             warning['message'] = message
 
-        result =  super(purchase_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty, uom,
-            partner_id, date_order, fiscal_position)
+        result =  super(purchase_order_line, self).onchange_product_id(cr, uid, ids, pricelist, product, qty, uom,
+            partner_id, date_order, fiscal_position_id)
 
         if result.get('warning',False):
             warning['title'] = title and title +' & '+result['warning']['title'] or result['warning']['title']