[MERGE] forward port of branch saas-1 up to revid 8772 chs@openerp.com-20130910122113...

bzr revid: chs@openerp.com-20130910124803-wxkb8gkz1tub5qjf

diff --cc addons/account/account.py
Simple merge

diff --cc addons/account/account_invoice.py
Simple merge

diff --cc addons/account/account_invoice_view.xml
Simple merge

diff --cc addons/analytic/analytic.py
Simple merge

diff --cc addons/base_calendar/base_calendar.py
Simple merge

diff --cc addons/crm/crm.py
index 04a17b9,93fcbdd..932fa99
--- 1/addons/crm/crm.py
--- 2/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@@ -160,19 -126,18 +160,19 @@@ class crm_case_section(osv.osv)
          'note': fields.text('Description'),
          'working_hours': fields.float('Working Hours', digits=(16, 2)),
          'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),
-         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
+         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True,
                                      help="The email address associated with this team. New emails received will automatically "
                                           "create new leads assigned to the team."),
 -        'open_lead_ids': fields.one2many('crm.lead', 'section_id',
 -            string='Open Leads', readonly=True,
 -            domain=['&', ('type', '!=', 'opportunity'), ('state', 'not in', ['done', 'cancel'])]),
 -        'open_opportunity_ids': fields.one2many('crm.lead', 'section_id',
 -            string='Open Opportunities', readonly=True,
 -            domain=['&', '|', ('type', '=', 'opportunity'), ('type', '=', 'both'), ('state', 'not in', ['done', 'cancel'])]),
          'color': fields.integer('Color Index'),
          'use_leads': fields.boolean('Leads',
 -            help="This enables the management of leads in the sales team. Otherwise the sales team manages only opportunities."),
 +            help="The first contact you get with a potential customer is a lead you qualify before converting it into a real business opportunity. Check this box to manage leads in this sales team."),
 +
 +        'monthly_open_leads': fields.function(_get_opportunities_data,
 +            type="string", readonly=True, multi='_get_opportunities_data',
 +            string='Open Leads per Month'),
 +        'monthly_planned_revenue': fields.function(_get_opportunities_data,
 +            type="string", readonly=True, multi='_get_opportunities_data',
 +            string='Planned Revenue per Month')
      }
  
      def _get_stage_common(self, cr, uid, context):

diff --cc addons/crm/crm_lead.py
Simple merge

diff --cc addons/email_template/email_template.py
Simple merge

diff --cc addons/hr_expense/hr_expense.py
Simple merge

diff --cc addons/hr_recruitment/hr_recruitment.py
Simple merge

diff --cc addons/mail/mail_group.py
Simple merge

diff --cc addons/mail/res_users.py
index 7bc39c4,eb2e8fc..ac1d406
--- 1/addons/mail/res_users.py
--- 2/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@@ -36,10 -34,9 +36,10 @@@ class res_users(osv.Model)
      _inherits = {'mail.alias': 'alias_id'}
  
      _columns = {
-         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
+         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="restrict", required=True,
              help="Email address internally associated with this user. Incoming "\
                   "emails will appear in the user's notifications."),
 +        'display_groups_suggestions': fields.boolean("Display Groups Suggestions"),
      }
  
      _defaults = {

diff --cc addons/membership/membership_view.xml
Simple merge

diff --cc addons/mrp/mrp.py
Simple merge

diff --cc addons/mrp/mrp_view.xml
Simple merge

diff --cc addons/point_of_sale/point_of_sale.py
index 1084a22,e0ba225..f200d63
--- 1/addons/point_of_sale/point_of_sale.py
--- 2/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@@ -505,9 -498,8 +510,8 @@@ class pos_order(osv.osv)
                  'session_id': order['pos_session_id'],
                  'lines': order['lines'],
                  'pos_reference':order['name'],
 -                'partner_id': order.get('partner_id', False)
 +                'partner_id': order['partner_id'] or False
              }, context)
- 
              for payments in order['statement_ids']:
                  payment = payments[2]
                  self.add_payment(cr, uid, order_id, {

diff --cc addons/point_of_sale/static/src/js/devices.js
index 9a74eec,0326d71..300bc46
--- 1/addons/point_of_sale/static/src/js/devices.js
--- 2/addons/point_of_sale/static/src/js/devices.js
+++ b/addons/point_of_sale/static/src/js/devices.js
@@@ -25,8 -25,9 +25,8 @@@ function openerp_pos_devices(instance,m
              };    
              this.custom_payment_status = this.default_payment_status;
  
 -            this.connection = new instance.web.JsonRPC();
 -            this.connection.setup(url);
 +            this.connection = new instance.web.Session(undefined,url);
- 
+             this.connection.session_id = _.uniqueId('posproxy');
              this.bypass_proxy = false;
              this.notifications = {};
              
@@@ -439,10 -437,9 +439,10 @@@
  
              // The barcode readers acts as a keyboard, we catch all keyup events and try to find a 
              // barcode sequence in the typed keys, then act accordingly.
-             $('body').delegate('','keyup', function (e){
 -            this.handler = function(e){
++            $('body').delegate('','keypress', function (e){
 +                //console.log('keyup:'+String.fromCharCode(e.keyCode)+' '+e.keyCode,e);
                  //We only care about numbers
 -                if (e.which >= 48 && e.which < 58){
 +                if (e.keyCode >= 48 && e.keyCode < 58){
  
                      // The barcode reader sends keystrokes with a specific interval.
                      // We look if the typed keys fit in the interval. 

diff --cc addons/product/pricelist.py
Simple merge

diff --cc addons/product/product.py
Simple merge

diff --cc addons/product/product_view.xml
Simple merge

diff --cc addons/project/project.py
Simple merge

diff --cc addons/project_mrp/process/project_mrp_process.xml
index c25cd26,5991571..db733d2
--- 1/addons/project_mrp/process/project_mrp_process.xml
--- 2/addons/project_mrp/process/project_mrp_process.xml
+++ b/addons/project_mrp/process/project_mrp_process.xml
@@@ -50,8 -67,8 +50,8 @@@
              <field eval="[(6,0,[])]" name="transition_ids"/>
              <field eval="&quot;&quot;&quot;Procurement Task&quot;&quot;&quot;" name="name"/>
              <field eval="&quot;&quot;&quot;if product type is 'service' then it creates the task.&quot;&quot;&quot;" name="note"/>
 -            <field model="process.node" name="target_node_id" ref="process_node_procuretasktask0"/>
 -            <field model="process.node" name="source_node_id" ref="sale_stock.process_node_saleprocurement0"/>
 +            <field name="target_node_id" ref="process_node_procuretasktask0"/>
-             <field name="source_node_id" ref="sale_stock.process_node_saleprocurement0"/>
++            <field name="source_node_id" ref="mrp.process_node_productionorder0"/>
          </record>
  
          <record id="process_transition_createtask0" model="process.transition">

diff --cc addons/purchase/partner.py
Simple merge

diff --cc addons/stock/stock.py
Simple merge