[MERGE] forward port of branch saas-4 up to f68c835
authorChristophe Simonis <chs@odoo.com>
Wed, 25 Jun 2014 10:43:41 +0000 (12:43 +0200)
committerChristophe Simonis <chs@odoo.com>
Wed, 25 Jun 2014 10:43:41 +0000 (12:43 +0200)
1  2 
addons/crm_claim/crm_claim.py
addons/l10n_be/wizard/l10n_be_vat_intra.py
addons/purchase_requisition/purchase_requisition.py
addons/web/static/src/js/chrome.js
addons/web_calendar/static/src/js/web_calendar.js
addons/website/controllers/main.py
addons/website/static/src/js/website.translator.js
openerp/addons/base/ir/ir_ui_view.py

@@@ -88,7 -88,7 +88,7 @@@ class crm_claim(osv.osv)
          'categ_id': fields.many2one('crm.case.categ', 'Category', \
                              domain="[('section_id','=',section_id),\
                              ('object_id.model', '=', 'crm.claim')]"),
 -        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
 +        'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority'),
          'type_action': fields.selection([('correction','Corrective Action'),('prevention','Preventive Action')], 'Action Type'),
          'user_id': fields.many2one('res.users', 'Responsible'),
          'user_fault': fields.char('Trouble Responsible', size=64),
          'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
          'date': fields.datetime.now,
          'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c),
 -        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
 +        'priority': '1',
          'active': lambda *a: 1,
          'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c)
      }
          # context: no_log, because subtype already handle this
          return super(crm_claim, self).create(cr, uid, vals, context=context)
  
+     def copy(self, cr, uid, id, default=None, context=None):
+         claim = self.browse(cr, uid, id, context=context)
+         default = dict(default or {},
+             stage_id = self._get_default_stage_id(cr, uid, context=context),
+             name = _('%s (copy)') % claim.name)
+         return super(crm_claim, self).copy(cr, uid, id, default, context=context)
      # -------------------------------------------------------
      # Mail gateway
      # -------------------------------------------------------
  
  class res_partner(osv.osv):
      _inherit = 'res.partner'
 +    def _claim_count(self, cr, uid, ids, field_name, arg, context=None):
 +        Claim = self.pool['crm.claim']
 +        return {
 +            partner_id: Claim.search_count(cr,uid, [('partner_id', '=', partner_id)], context=context)  
 +            for partner_id in ids
 +        }
 +
      _columns = {
 -        'claims_ids': fields.one2many('crm.claim', 'partner_id', 'Claims'),
 +        'claim_count': fields.function(_claim_count, string='# Claims', type='integer'),
      }
  
  # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
@@@ -29,7 -29,6 +29,7 @@@ from openerp.osv import fields, os
  from openerp.tools.translate import _
  from openerp.report import report_sxw
  
 +
  class partner_vat_intra(osv.osv_memory):
      """
      Partner Vat Intra
          data_head = """<?xml version="1.0" encoding="ISO-8859-1"?>
  <ns2:IntraConsignment xmlns="http://www.minfin.fgov.be/InputCommon" xmlns:ns2="http://www.minfin.fgov.be/IntraConsignment" IntraListingsNbr="1">
      <ns2:Representative>
-         <RepresentativeID identificationType="NVAT" issuedBy="%(issued_by)s">%(company_vat)s</RepresentativeID>
+         <RepresentativeID identificationType="NVAT" issuedBy="%(issued_by)s">%(vatnum)s</RepresentativeID>
          <Name>%(company_name)s</Name>
          <Street>%(street)s</Street>
          <PostCode>%(post_code)s</PostCode>
               'model': 'partner.vat.intra',
               'form': xml_data
          }
 -        return {
 -            'type': 'ir.actions.report.xml',
 -            'report_name': 'partner.vat.intra.print',
 -            'datas': datas,
 -        }
 +        return self.pool['report'].get_action(
 +            cr, uid, [], 'l10n_be.report_l10nvatintraprint', data=datas, context=context
 +        )
  
  
  class vat_intra_print(report_sxw.rml_parse):
              'time': time,
          })
  
 -report_sxw.report_sxw('report.partner.vat.intra.print', 'partner.vat.intra', 'addons/l10n_be/wizard/l10n_be_vat_intra_print.rml', parser=vat_intra_print, header="internal")
 +
 +class wrapped_vat_intra_print(osv.AbstractModel):
 +    _name = 'report.l10n_be.report_l10nvatintraprint'
 +    _inherit = 'report.abstract_report'
 +    _template = 'l10n_be.report_l10nvatintraprint'
 +    _wrapped_report_class = vat_intra_print
  
  # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
@@@ -23,155 -23,99 +23,159 @@@ from datetime import datetim
  from dateutil.relativedelta import relativedelta
  import time
  
 -from openerp.osv import fields,osv
 +from openerp.osv import fields, osv
  from openerp.tools.translate import _
  import openerp.addons.decimal_precision as dp
  
  class purchase_requisition(osv.osv):
      _name = "purchase.requisition"
 -    _description="Purchase Requisition"
 +    _description = "Purchase Requisition"
      _inherit = ['mail.thread', 'ir.needaction_mixin']
 +
 +    def _get_po_line(self, cr, uid, ids, field_names, arg=None, context=None):
 +        result = {}.fromkeys(ids, [])
 +        for element in self.browse(cr, uid, ids, context=context):
 +            for po in element.purchase_ids:
 +                result[element.id] += [po_line.id for po_line in po.order_line]
 +        return result
 +
      _columns = {
 -        'name': fields.char('Requisition Reference', size=32,required=True),
 +        'name': fields.char('Call for Bids Reference', size=32, required=True),
          'origin': fields.char('Source Document', size=32),
 -        'date_start': fields.datetime('Requisition Date'),
 -        'date_end': fields.datetime('Requisition Deadline'),
 +        'ordering_date': fields.date('Scheduled Ordering Date'),
 +        'date_end': fields.datetime('Bid Submission Deadline'),
 +        'schedule_date': fields.date('Scheduled Date', select=True, help="The expected and scheduled date where all the products are received"),
          'user_id': fields.many2one('res.users', 'Responsible'),
 -        'exclusive': fields.selection([('exclusive','Purchase Requisition (exclusive)'),('multiple','Multiple Requisitions')],'Requisition Type', required=True, help="Purchase Requisition (exclusive): On the confirmation of a purchase order, it cancels the remaining purchase order.\nMultiple Requisitions: It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"""),
 +        'exclusive': fields.selection([('exclusive', 'Select only one RFQ (exclusive)'), ('multiple', 'Select multiple RFQ')], 'Bid Selection Type', required=True, help="Select only one RFQ (exclusive):  On the confirmation of a purchase order, it cancels the remaining purchase order.\nSelect multiple RFQ:  It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"""),
          'description': fields.text('Description'),
          'company_id': fields.many2one('res.company', 'Company', required=True),
 -        'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders',states={'done': [('readonly', True)]}),
 -        'line_ids' : fields.one2many('purchase.requisition.line','requisition_id','Products to Purchase',states={'done': [('readonly', True)]}),
 -        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),        
 -        'state': fields.selection([('draft','New'),('in_progress','Sent to Suppliers'),('cancel','Cancelled'),('done','Purchase Done')],
 -            'Status', track_visibility='onchange', required=True)
 +        'purchase_ids': fields.one2many('purchase.order', 'requisition_id', 'Purchase Orders', states={'done': [('readonly', True)]}),
 +        'po_line_ids': fields.function(_get_po_line, method=True, type='one2many', relation='purchase.order.line', string='Products by supplier'),
 +        'line_ids': fields.one2many('purchase.requisition.line', 'requisition_id', 'Products to Purchase', states={'done': [('readonly', True)]}),
 +        'procurement_id': fields.many2one('procurement.order', 'Procurement', ondelete='set null'),
 +        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
 +        'state': fields.selection([('draft', 'Draft'), ('in_progress', 'Confirmed'), ('open', 'Bid Selection'), ('done', 'PO Created'), ('cancel', 'Cancelled')],
 +            'Status', track_visibility='onchange', required=True),
 +        'multiple_rfq_per_supplier': fields.boolean('Multiple RFQ per supplier'),
 +        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'),
 +        'picking_type_id': fields.many2one('stock.picking.type', 'Picking Type', required=True),
      }
 +
 +    def _get_picking_in(self, cr, uid, context=None):
 +        obj_data = self.pool.get('ir.model.data')
 +        return obj_data.get_object_reference(cr, uid, 'stock','picking_type_in')[1]
 +
      _defaults = {
          'state': 'draft',
          'exclusive': 'multiple',
          'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.requisition', context=c),
 -        'user_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).id ,
 +        'user_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).id,
          'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order.requisition'),
 +        'picking_type_id': _get_picking_in,
      }
  
      def copy(self, cr, uid, id, default=None, context=None):
 -        if not default:
 -            default = {}
 +        default = default or {}
          default.update({
 -            'state':'draft',
 -            'purchase_ids':[],
 +            'state': 'draft',
 +            'purchase_ids': [],
              'name': self.pool.get('ir.sequence').get(cr, uid, 'purchase.order.requisition'),
          })
          return super(purchase_requisition, self).copy(cr, uid, id, default, context)
 -    
 +
      def tender_cancel(self, cr, uid, ids, context=None):
          purchase_order_obj = self.pool.get('purchase.order')
 -        for purchase in self.browse(cr, uid, ids, context=context):
 -            for purchase_id in purchase.purchase_ids:
 -                if str(purchase_id.state) in('draft'):
 -                    purchase_order_obj.action_cancel(cr,uid,[purchase_id.id])
 +        #try to set all associated quotations to cancel state
 +        purchase_ids = []
 +        for tender in self.browse(cr, uid, ids, context=context):
 +            for purchase_order in tender.purchase_ids:
 +                purchase_order_obj.action_cancel(cr, uid, [purchase_order.id], context=context)
 +                purchase_order_obj.message_post(cr, uid, [purchase_order.id], body=_('Cancelled by the tender associated to this quotation.'), context=context)
+         procurement_ids = self.pool['procurement.order'].search(cr, uid, [('requisition_id', 'in', ids)], context=context)
+         self.pool['procurement.order'].action_done(cr, uid, procurement_ids)
          return self.write(cr, uid, ids, {'state': 'cancel'})
  
      def tender_in_progress(self, cr, uid, ids, context=None):
 -        return self.write(cr, uid, ids, {'state':'in_progress'} ,context=context)
 +        return self.write(cr, uid, ids, {'state': 'in_progress'}, context=context)
 +
 +    def tender_open(self, cr, uid, ids, context=None):
 +        return self.write(cr, uid, ids, {'state': 'open'}, context=context)
  
      def tender_reset(self, cr, uid, ids, context=None):
 -        return self.write(cr, uid, ids, {'state': 'draft'})
 +        self.write(cr, uid, ids, {'state': 'draft'})
 +        for p_id in ids:
 +            # Deleting the existing instance of workflow for PO
 +            self.delete_workflow(cr, uid, [p_id])
 +            self.create_workflow(cr, uid, [p_id])
 +        return True
  
      def tender_done(self, cr, uid, ids, context=None):
+         procurement_ids = self.pool['procurement.order'].search(cr, uid, [('requisition_id', 'in', ids)], context=context)
+         self.pool['procurement.order'].action_done(cr, uid, procurement_ids)
 -        return self.write(cr, uid, ids, {'state':'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
 -
 -    def _planned_date(self, requisition, delay=0.0):
 -        company = requisition.company_id
 -        date_planned = False
 -        if requisition.date_start:
 -            date_planned = datetime.strptime(requisition.date_start, '%Y-%m-%d %H:%M:%S') - relativedelta(days=company.po_lead)
 -        else:
 -            date_planned = datetime.today() - relativedelta(days=company.po_lead)
 -        if delay:
 -            date_planned -= relativedelta(days=delay)
 -        return date_planned and date_planned.strftime('%Y-%m-%d %H:%M:%S') or False
 -
 -    def _seller_details(self, cr, uid, requisition_line, supplier, context=None):
 +        return self.write(cr, uid, ids, {'state': 'done'}, context=context)
 +
 +    def open_product_line(self, cr, uid, ids, context=None):
 +        """ This opens product line view to view all lines from the different quotations, groupby default by product and partner to show comparaison
 +            between supplier price
 +            @return: the product line tree view
 +        """
 +        if context is None:
 +            context = {}
 +        res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'purchase_requisition', 'purchase_line_tree', context=context)
 +        res['context'] = context
 +        po_lines = self.browse(cr, uid, ids, context=context)[0].po_line_ids
 +        res['context'] = {
 +            'search_default_groupby_product': True,
 +            'search_default_hide_cancelled': True,
 +        }
 +        res['domain'] = [('id', 'in', [line.id for line in po_lines])]
 +        return res
 +
 +    def open_rfq(self, cr, uid, ids, context=None):
 +        """ This opens rfq view to view all quotations associated to the call for bids
 +            @return: the RFQ tree view
 +        """
 +        if context is None:
 +            context = {}
 +        res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'purchase', 'purchase_rfq', context=context)
 +        res['context'] = context
 +        po_ids = [po.id for po in self.browse(cr, uid, ids, context=context)[0].purchase_ids]
 +        res['domain'] = [('id', 'in', po_ids)]
 +        return res
 +
 +    def _prepare_purchase_order(self, cr, uid, requisition, supplier, context=None):
 +        supplier_pricelist = supplier.property_product_pricelist_purchase and supplier.property_product_pricelist_purchase.id or False
 +        picking_type_in = self.pool.get("purchase.order")._get_picking_in(cr, uid, context=context)
 +        return {
 +            'origin': requisition.name,
 +            'date_order': requisition.date_end or fields.date.context_today(self, cr, uid, context=context),
 +            'partner_id': supplier.id,
 +            'pricelist_id': supplier_pricelist,
 +            'location_id': requisition.picking_type_id.default_location_dest_id.id,
 +            'company_id': requisition.company_id.id,
 +            'fiscal_position': supplier.property_account_position and supplier.property_account_position.id or False,
 +            'requisition_id': requisition.id,
 +            'notes': requisition.description,
 +            'picking_type_id': picking_type_in,
 +        }
 +
 +    def _prepare_purchase_order_line(self, cr, uid, requisition, requisition_line, purchase_id, supplier, context=None):
 +        po_line_obj = self.pool.get('purchase.order.line')
          product_uom = self.pool.get('product.uom')
 -        pricelist = self.pool.get('product.pricelist')
          product = requisition_line.product_id
          default_uom_po_id = product.uom_po_id.id
 +        date_order = requisition.ordering_date or fields.date.context_today(self, cr, uid, context=context)
          qty = product_uom._compute_qty(cr, uid, requisition_line.product_uom_id.id, requisition_line.product_qty, default_uom_po_id)
 -        seller_delay = 0.0
 -        seller_price = False
 -        seller_qty = False
 -        for product_supplier in product.seller_ids:
 -            if supplier.id ==  product_supplier.name and qty >= product_supplier.qty:
 -                seller_delay = product_supplier.delay
 -                seller_qty = product_supplier.qty
 -        supplier_pricelist = supplier.property_product_pricelist_purchase or False
 -        seller_price = pricelist.price_get(cr, uid, [supplier_pricelist.id], product.id, qty, supplier.id, {'uom': default_uom_po_id})[supplier_pricelist.id]
 -        if seller_qty:
 -            qty = max(qty,seller_qty)
 -        date_planned = self._planned_date(requisition_line.requisition_id, seller_delay)
 -        return seller_price, qty, default_uom_po_id, date_planned
 +        supplier_pricelist = supplier.property_product_pricelist_purchase and supplier.property_product_pricelist_purchase.id or False
 +        vals = po_line_obj.onchange_product_id(cr, uid, [], supplier_pricelist, product.id, qty, default_uom_po_id,
 +            supplier.id, date_order=date_order, fiscal_position_id=supplier.property_account_position, date_planned=requisition_line.schedule_date,
 +            name=False, price_unit=False, state='draft', context=context)['value']
 +        vals.update({
 +            'order_id': purchase_id,
 +            'product_id': product.id,
 +            'account_analytic_id': requisition_line.account_analytic_id.id,
 +        })
 +        return vals
  
      def make_purchase_order(self, cr, uid, ids, partner_id, context=None):
          """
          purchase_order = self.pool.get('purchase.order')
          purchase_order_line = self.pool.get('purchase.order.line')
          res_partner = self.pool.get('res.partner')
 -        fiscal_position = self.pool.get('account.fiscal.position')
          supplier = res_partner.browse(cr, uid, partner_id, context=context)
 -        supplier_pricelist = supplier.property_product_pricelist_purchase or False
          res = {}
          for requisition in self.browse(cr, uid, ids, context=context):
 -            if supplier.id in filter(lambda x: x, [rfq.state <> 'cancel' and rfq.partner_id.id or None for rfq in requisition.purchase_ids]):
 -                 raise osv.except_osv(_('Warning!'), _('You have already one %s purchase order for this partner, you must cancel this purchase order to create a new quotation.') % rfq.state)
 -            location_id = requisition.warehouse_id.lot_input_id.id
 +            if not requisition.multiple_rfq_per_supplier and supplier.id in filter(lambda x: x, [rfq.state != 'cancel' and rfq.partner_id.id or None for rfq in requisition.purchase_ids]):
 +                raise osv.except_osv(_('Warning!'), _('You have already one %s purchase order for this partner, you must cancel this purchase order to create a new quotation.') % rfq.state)
              context.update({'mail_create_nolog': True})
 -            purchase_id = purchase_order.create(cr, uid, {
 -                        'origin': requisition.name,
 -                        'partner_id': supplier.id,
 -                        'pricelist_id': supplier_pricelist.id,
 -                        'location_id': location_id,
 -                        'company_id': requisition.company_id.id,
 -                        'fiscal_position': supplier.property_account_position and supplier.property_account_position.id or False,
 -                        'requisition_id':requisition.id,
 -                        'notes':requisition.description,
 -                        'warehouse_id':requisition.warehouse_id.id ,
 -            })
 +            purchase_id = purchase_order.create(cr, uid, self._prepare_purchase_order(cr, uid, requisition, supplier, context=context), context=context)
              purchase_order.message_post(cr, uid, [purchase_id], body=_("RFQ created"), context=context)
              res[requisition.id] = purchase_id
              for line in requisition.line_ids:
 -                product = line.product_id
 -                seller_price, qty, default_uom_po_id, date_planned = self._seller_details(cr, uid, line, supplier, context=context)
 -                taxes_ids = product.supplier_taxes_id
 -                taxes = fiscal_position.map_tax(cr, uid, supplier.property_account_position, taxes_ids)
 -                purchase_order_line.create(cr, uid, {
 -                    'order_id': purchase_id,
 -                    'name': product.partner_ref,
 -                    'product_qty': qty,
 -                    'product_id': product.id,
 -                    'product_uom': default_uom_po_id,
 -                    'price_unit': seller_price,
 -                    'date_planned': date_planned,
 -                    'taxes_id': [(6, 0, taxes)],
 -                }, context=context)
 -                
 +                purchase_order_line.create(cr, uid, self._prepare_purchase_order_line(cr, uid, requisition, line, purchase_id, supplier, context=context), context=context)
          return res
  
 +    def check_valid_quotation(self, cr, uid, quotation, context=None):
 +        """
 +        Check if a quotation has all his order lines bid in order to confirm it if its the case
 +        return True if all order line have been selected during bidding process, else return False
  
 -class purchase_requisition_line(osv.osv):
 +        args : 'quotation' must be a browse record
 +        """
 +        for line in quotation.order_line:
 +            if line.state != 'confirmed' or line.product_qty != line.quantity_bid:
 +                return False
 +        return True
 +
 +    def _prepare_po_from_tender(self, cr, uid, tender, context=None):
 +        """ Prepare the values to write in the purchase order
 +        created from a tender.
 +
 +        :param tender: the source tender from which we generate a purchase order
 +        """
 +        return {'order_line': [],
 +                'requisition_id': tender.id,
 +                'origin': tender.name}
 +
 +    def _prepare_po_line_from_tender(self, cr, uid, tender, line, purchase_id, context=None):
 +        """ Prepare the values to write in the purchase order line
 +        created from a line of the tender.
 +
 +        :param tender: the source tender from which we generate a purchase order
 +        :param line: the source tender's line from which we generate a line
 +        :param purchase_id: the id of the new purchase
 +        """
 +        return {'product_qty': line.quantity_bid,
 +                'order_id': purchase_id}
 +
 +    def generate_po(self, cr, uid, ids, context=None):
 +        """
 +        Generate all purchase order based on selected lines, should only be called on one tender at a time
 +        """
 +        if context is None:
 +            contex = {}
 +        po = self.pool.get('purchase.order')
 +        poline = self.pool.get('purchase.order.line')
 +        id_per_supplier = {}
 +        for tender in self.browse(cr, uid, ids, context=context):
 +            if tender.state == 'done':
 +                raise osv.except_osv(_('Warning!'), _('You have already generate the purchase order(s).'))
 +
 +            confirm = False
 +            #check that we have at least confirm one line
 +            for po_line in tender.po_line_ids:
 +                if po_line.state == 'confirmed':
 +                    confirm = True
 +                    break
 +            if not confirm:
 +                raise osv.except_osv(_('Warning!'), _('You have no line selected for buying.'))
 +
 +            #check for complete RFQ
 +            for quotation in tender.purchase_ids:
 +                if (self.check_valid_quotation(cr, uid, quotation, context=context)):
 +                    #use workflow to set PO state to confirm
 +                    po.signal_purchase_confirm(cr, uid, [quotation.id])
 +
 +            #get other confirmed lines per supplier
 +            for po_line in tender.po_line_ids:
 +                #only take into account confirmed line that does not belong to already confirmed purchase order
 +                if po_line.state == 'confirmed' and po_line.order_id.state in ['draft', 'sent', 'bid']:
 +                    if id_per_supplier.get(po_line.partner_id.id):
 +                        id_per_supplier[po_line.partner_id.id].append(po_line)
 +                    else:
 +                        id_per_supplier[po_line.partner_id.id] = [po_line]
 +
 +            #generate po based on supplier and cancel all previous RFQ
 +            ctx = context.copy()
 +            ctx['force_requisition_id'] = True
 +            for supplier, product_line in id_per_supplier.items():
 +                #copy a quotation for this supplier and change order_line then validate it
 +                quotation_id = po.search(cr, uid, [('requisition_id', '=', tender.id), ('partner_id', '=', supplier)], limit=1)[0]
 +                vals = self._prepare_po_from_tender(cr, uid, tender, context=context)
 +                new_po = po.copy(cr, uid, quotation_id, default=vals, context=ctx)
 +                #duplicate po_line and change product_qty if needed and associate them to newly created PO
 +                for line in product_line:
 +                    vals = self._prepare_po_line_from_tender(cr, uid, tender, line, new_po, context=context)
 +                    poline.copy(cr, uid, line.id, default=vals, context=context)
 +                #use workflow to set new PO state to confirm
 +                po.signal_purchase_confirm(cr, uid, [new_po])
 +
 +            #cancel other orders
 +            self.cancel_unconfirmed_quotations(cr, uid, tender, context=context)
 +
 +            #set tender to state done
 +            self.signal_done(cr, uid, [tender.id])
 +        return True
  
 +    def cancel_unconfirmed_quotations(self, cr, uid, tender, context=None):
 +        #cancel other orders
 +        po = self.pool.get('purchase.order')
 +        for quotation in tender.purchase_ids:
 +            if quotation.state in ['draft', 'sent', 'bid']:
 +                self.pool.get('purchase.order').signal_purchase_cancel(cr, uid, [quotation.id])
 +                po.message_post(cr, uid, [quotation.id], body=_('Cancelled by the call for bids associated to this request for quotation.'), context=context)
 +        return True
 +
 +
 +class purchase_requisition_line(osv.osv):
      _name = "purchase.requisition.line"
 -    _description="Purchase Requisition Line"
 +    _description = "Purchase Requisition Line"
      _rec_name = 'product_id'
  
      _columns = {
 -        'product_id': fields.many2one('product.product', 'Product' ),
 +        'product_id': fields.many2one('product.product', 'Product'),
          'product_uom_id': fields.many2one('product.uom', 'Product Unit of Measure'),
          'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure')),
 -        'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition', ondelete='cascade'),
 -        'company_id': fields.related('requisition_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
 +        'requisition_id': fields.many2one('purchase.requisition', 'Call for Bids', ondelete='cascade'),
 +        'company_id': fields.related('requisition_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
 +        'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account',),
 +        'schedule_date': fields.date('Scheduled Date'),
      }
  
 -    def onchange_product_id(self, cr, uid, ids, product_id, product_uom_id, context=None):
 +    def onchange_product_id(self, cr, uid, ids, product_id, product_uom_id, parent_analytic_account, analytic_account, parent_date, date, context=None):
          """ Changes UoM and name if product_id changes.
          @param name: Name of the field
          @param product_id: Changed product_id
          value = {'product_uom_id': ''}
          if product_id:
              prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
 -            value = {'product_uom_id': prod.uom_id.id,'product_qty':1.0}
 +            value = {'product_uom_id': prod.uom_id.id, 'product_qty': 1.0}
 +        if not analytic_account:
 +            value.update({'account_analytic_id': parent_analytic_account})
 +        if not date:
 +            value.update({'schedule_date': parent_date})
          return {'value': value}
  
      _defaults = {
  
  class purchase_order(osv.osv):
      _inherit = "purchase.order"
 +
      _columns = {
 -        'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition')
 +        'requisition_id': fields.many2one('purchase.requisition', 'Call for Bids'),
      }
  
      def wkf_confirm_order(self, cr, uid, ids, context=None):
          res = super(purchase_order, self).wkf_confirm_order(cr, uid, ids, context=context)
          proc_obj = self.pool.get('procurement.order')
          for po in self.browse(cr, uid, ids, context=context):
 -            if po.requisition_id and (po.requisition_id.exclusive=='exclusive'):
 +            if po.requisition_id and (po.requisition_id.exclusive == 'exclusive'):
                  for order in po.requisition_id.purchase_ids:
                      if order.id != po.id:
                          proc_ids = proc_obj.search(cr, uid, [('purchase_id', '=', order.id)])
 -                        if proc_ids and po.state=='confirmed':
 +                        if proc_ids and po.state == 'confirmed':
                              proc_obj.write(cr, uid, proc_ids, {'purchase_id': po.id})
                          self.signal_purchase_cancel(cr, uid, [order.id])
                      po.requisition_id.tender_done(context=context)
+             if po.requisition_id and all(purchase_id.state in ['draft', 'cancel'] for purchase_id in po.requisition_id.purchase_ids if purchase_id.id != po.id):
+                 procurement_ids = self.pool['procurement.order'].search(cr, uid, [('requisition_id', '=', po.requisition_id.id)], context=context)
+                 for procurement in proc_obj.browse(cr, uid, procurement_ids, context=context):
+                     procurement.move_id.write({'location_id': procurement.move_id.location_dest_id.id})
          return res
  
 +    def copy(self, cr, uid, id, default=None, context=None):
 +        if context is None:
 +            context = {}
 +        if not context.get('force_requisition_id'):
 +            default = default or {}
 +            default.update({'requisition_id': False})
 +        return super(purchase_order, self).copy(cr, uid, id, default=default, context=context)
 +
 +    def _prepare_order_line_move(self, cr, uid, order, order_line, picking_id, group_id, context=None):
 +        stock_move_lines = super(purchase_order, self)._prepare_order_line_move(cr, uid, order, order_line, picking_id, group_id, context=context)
 +        if order.requisition_id and order.requisition_id.procurement_id and order.requisition_id.procurement_id.move_dest_id:
 +            for i in range(0, len(stock_move_lines)):
 +                stock_move_lines[i]['move_dest_id'] = order.requisition_id.procurement_id.move_dest_id.id
 +        return stock_move_lines
  
 -class product_product(osv.osv):
 -    _inherit = 'product.product'
 +
 +class purchase_order_line(osv.osv):
 +    _inherit = 'purchase.order.line'
  
      _columns = {
 -        'purchase_requisition': fields.boolean('Purchase Requisition', help="Check this box to generates purchase requisition instead of generating requests for quotation from procurement.")
 +        'quantity_bid': fields.float('Quantity Bid', digits_compute=dp.get_precision('Product Unit of Measure'), help="Technical field for not loosing the initial information about the quantity proposed in the bid"),
      }
 -    _defaults = {
 -        'purchase_requisition': False
 +
 +    def action_draft(self, cr, uid, ids, context=None):
 +        self.write(cr, uid, ids, {'state': 'draft'}, context=context)
 +
 +    def action_confirm(self, cr, uid, ids, context=None):
 +        super(purchase_order_line, self).action_confirm(cr, uid, ids, context=context)
 +        for element in self.browse(cr, uid, ids, context=context):
 +            if not element.quantity_bid:
 +                self.write(cr, uid, ids, {'quantity_bid': element.product_qty}, context=context)
 +        return True
 +
 +    def generate_po(self, cr, uid, tender_id, context=None):
 +        #call generate_po from tender with active_id. Called from js widget
 +        return self.pool.get('purchase.requisition').generate_po(cr, uid, [tender_id], context=context)
 +
 +
 +class product_template(osv.osv):
 +    _inherit = 'product.template'
 +
 +    _columns = {
 +        'purchase_requisition': fields.boolean('Call for Bids', help="Check this box to generate Call for Bids instead of generating requests for quotation from procurement.")
      }
  
  
@@@ -406,35 -240,66 +414,35 @@@ class procurement_order(osv.osv)
          'requisition_id': fields.many2one('purchase.requisition', 'Latest Requisition')
      }
  
 -    def _get_warehouse(self, procurement, user_company):
 -        """
 -            Return the warehouse containing the procurment stock location (or one of it ancestors)
 -            If none match, returns then first warehouse of the company
 -        """
 -        # NOTE This method is a copy of the one on the procurement.order defined in purchase
 -        #      module. It's been copied to ensure it been always available, even if module
 -        #      purchase is not up to date.
 -        #      Do not forget to update both version in case of modification.
 -        company_id = (procurement.company_id or user_company).id
 -        domains = [
 -            [
 -                '&', ('company_id', '=', company_id),
 -                '|', '&', ('lot_stock_id.parent_left', '<', procurement.location_id.parent_left),
 -                          ('lot_stock_id.parent_right', '>', procurement.location_id.parent_right),
 -                     ('lot_stock_id', '=', procurement.location_id.id)
 -            ],
 -            [('company_id', '=', company_id)]
 -        ]
 -
 -        cr, uid = procurement._cr, procurement._uid
 -        context = procurement._context
 -        Warehouse = self.pool['stock.warehouse']
 -        for domain in domains:
 -            ids = Warehouse.search(cr, uid, domain, context=context)
 -            if ids:
 -                return ids[0]
 -        return False
 -
 -    def make_po(self, cr, uid, ids, context=None):
 -        res = {}
 +    def _run(self, cr, uid, procurement, context=None):
          requisition_obj = self.pool.get('purchase.requisition')
 -        non_requisition = []
 -        for procurement in self.browse(cr, uid, ids, context=context):
 -            if procurement.product_id.purchase_requisition:
 -                user_company = self.pool['res.users'].browse(cr, uid, uid, context=context).company_id
 -                req = requisition_obj.create(cr, uid, {
 -                    'origin': procurement.origin,
 -                    'date_end': procurement.date_planned,
 -                    'warehouse_id': self._get_warehouse(procurement, user_company),
 -                    'company_id': procurement.company_id.id,
 -                    'line_ids': [(0, 0, {
 -                        'product_id': procurement.product_id.id,
 -                        'product_uom_id': procurement.product_uom.id,
 -                        'product_qty': procurement.product_qty
 -
 -                    })],
 -                })
 -                procurement.write({
 -                    'state': 'running',
 -                    'requisition_id': req
 -                })
 -                res[procurement.id] = 0
 -            else:
 -                non_requisition.append(procurement.id)
 -
 -        if non_requisition:
 -            res.update(super(procurement_order, self).make_po(cr, uid, non_requisition, context=context))
 +        warehouse_obj = self.pool.get('stock.warehouse')
 +        if procurement.rule_id and procurement.rule_id.action == 'buy' and procurement.product_id.purchase_requisition:
 +            warehouse_id = warehouse_obj.search(cr, uid, [('company_id', '=', procurement.company_id.id)], context=context)
 +            requisition_id = requisition_obj.create(cr, uid, {
 +                'origin': procurement.origin,
 +                'date_end': procurement.date_planned,
 +                'warehouse_id': warehouse_id and warehouse_id[0] or False,
 +                'company_id': procurement.company_id.id,
 +                'procurement_id': procurement.id,
 +                'line_ids': [(0, 0, {
 +                    'product_id': procurement.product_id.id,
 +                    'product_uom_id': procurement.product_uom.id,
 +                    'product_qty': procurement.product_qty
  
 -        return res
 +                })],
 +            })
 +            self.message_post(cr, uid, [procurement.id], body=_("Purchase Requisition created"), context=context)
 +            return self.write(cr, uid, [procurement.id], {'requisition_id': requisition_id}, context=context)
 +        return super(procurement_order, self)._run(cr, uid, procurement, context=context)
  
 +    def _check(self, cr, uid, procurement, context=None):
 +        requisition_obj = self.pool.get('purchase.requisition')
 +        if procurement.rule_id and procurement.rule_id.action == 'buy' and procurement.product_id.purchase_requisition:
 +            if procurement.requisition_id.state == 'done':
 +                if any([purchase.shipped for purchase in procurement.requisition_id.purchase_ids]):
 +                    return True
 +            return False
 +        return super(procurement_order, self)._check(cr, uid, procurement, context=context)
  
  # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
@@@ -493,7 -493,7 +493,7 @@@ instance.web.DatabaseManager = instance
              size: 'medium',
              title: error.title,
              buttons: [
-                 {text: _t("Ok"), click: function() { this.$el.parents('.modal').modal('hide'); }}
+                 {text: _t("Ok"), click: function() { this.parents('.modal').modal('hide'); }}
              ]
          }, $('<div>').html(error.error)).open();
      },
@@@ -706,7 -706,7 +706,7 @@@ instance.web.ChangePassword =  instance
          var $button = self.$el.find('.oe_form_button');
          $button.appendTo(this.getParent().$buttons);
          $button.eq(2).click(function(){
-            self.getParent().close();
+            self.$el.parents('.modal').modal('hide');
          });
          $button.eq(0).click(function(){
            self.rpc("/web/session/change_password",{
              size: 'medium',
              title: error.title,
              buttons: [
-                 {text: _t("Ok"), click: function() { this.$el.parents('.modal').modal('hide'); }}
+                 {text: _t("Ok"), click: function() { this.parents('.modal').modal('hide'); }}
              ]
          }, $('<div>').html(error.error)).open();
      },
@@@ -872,10 -872,6 +872,10 @@@ instance.web.Menu =  instance.web.Widge
                  $clicked_menu.parent().addClass('active');
              }
          }
 +        // add a tooltip to cropped menu items
 +        this.$secondary_menus.find('.oe_secondary_submenu li a span').each(function() {
 +            $(this).tooltip(this.scrollWidth > this.clientWidth ? {title: $(this).text().trim(), placement: 'auto right'} :'destroy');
 +       });
      },
      /**
       * Call open_menu with the first menu_item matching an action_id
@@@ -1095,8 -1091,8 +1095,8 @@@ instance.web.Client = instance.web.Widg
      },
      bind_events: function() {
          var self = this;
 -        this.$el.on('mouseenter', '.oe_systray > div:not([data-tipsy=true])', function() {
 -            $(this).attr('data-tipsy', 'true').tipsy().trigger('mouseenter');
 +        this.$el.on('mouseenter', '.oe_systray > div:not([data-toggle=tooltip])', function() {
 +            $(this).attr('data-toggle', 'tooltip').tooltip().trigger('mouseenter');
          });
          this.$el.on('click', '.oe_dropdown_toggle', function(ev) {
              ev.preventDefault();
              }, 0);
          });
          instance.web.bus.on('click', this, function(ev) {
 -            $.fn.tipsy.clear();
 +            $.fn.tooltip('destroy');
              if (!$(ev.target).is('input[type=file]')) {
                  self.$el.find('.oe_dropdown_menu.oe_opened, .oe_dropdown_toggle.oe_opened').removeClass('oe_opened');
              }
@@@ -1474,7 -1470,7 +1474,7 @@@ instance.web.embed = function (origin, 
      $('head').append($('<link>', {
          'rel': 'stylesheet',
          'type': 'text/css',
 -        'href': origin +'/web/webclient/css'
 +        'href': origin +'/web/css/web.assets_webclient'
      }));
      var currentScript = document.currentScript;
      if (!currentScript) {
@@@ -11,6 -11,7 +11,6 @@@ _.str.toBoolElse = function (str, elseV
  };
  
  openerp.web_calendar = function(instance) {
 -
      var _t = instance.web._t,
          _lt = instance.web._lt,
          QWeb = instance.web.qweb;
                  date_stop = this.date_stop ? instance.web.auto_str_to_date(evt[this.date_stop]) : null;
              }
              else {
 -                date_start = instance.web.auto_str_to_date(evt[this.date_start].split(' ')[0],'date');
 -                date_stop = this.date_stop ? instance.web.auto_str_to_date(evt[this.date_stop].split(' ')[0],'date').addMinutes(-1) : null;
 +                date_start = instance.web.auto_str_to_date(evt[this.date_start].split(' ')[0],'start');
 +                date_stop = this.date_stop ? instance.web.auto_str_to_date(evt[this.date_stop].split(' ')[0],'start') : null; //.addSeconds(-1) : null;
              }
  
              if (this.info_fields) {
                      event_end = new Date(event.start);
                  }
                  if (this.all_day) {
 -                    event_end = (new Date(event_end.getTime())).addDays(1);
 -                    date_start_day = new Date(event.start.getFullYear(),event.start.getMonth(),event.start.getDate(),12);
 -                    date_stop_day = new Date(event_end.getFullYear(),event_end.getMonth(),event_end.getDate(),12);
 +                    //event_end = (new Date(event_end.getTime())).addDays(1);
 +                    date_start_day = new Date(Date.UTC(event.start.getFullYear(),event.start.getMonth(),event.start.getDate()));
 +                    date_stop_day = new Date(Date.UTC(event_end.getFullYear(),event_end.getMonth(),event_end.getDate()));                    
                  }
                  else {
                      date_start_day = new Date(event.start.getFullYear(),event.start.getMonth(),event.start.getDate(),7);
                      date_stop_day = new Date(event_end.getFullYear(),event_end.getMonth(),event_end.getDate(),19);
                  }
-                 data[this.date_start] = instance.web.parse_value(date_start_day, this.fields[this.date_start]);
-                 if (this.date_stop) {
-                     data[this.date_stop] = instance.web.parse_value(date_stop_day, this.fields[this.date_stop]);
-                 }
                  diff_seconds = Math.round((date_stop_day.getTime() - date_start_day.getTime()) / 1000);
                                  
              }
              else {
-                 data[this.date_start] = instance.web.parse_value(event.start, this.fields[this.date_start]);
+                 data[this.date_start] = event.start;
                  if (this.date_stop) {
-                     data[this.date_stop] = instance.web.parse_value(event_end, this.fields[this.date_stop]);
+                     data[this.date_stop] = event_end;
                  }
                  diff_seconds = Math.round((event_end.getTime() - event.start.getTime()) / 1000);
              }
@@@ -27,29 -27,24 +27,29 @@@ class Website(openerp.addons.web.contro
      #------------------------------------------------------
      # View
      #------------------------------------------------------
 -    @http.route('/', type='http', auth="public", website=True, multilang=True)
 +    @http.route('/', type='http', auth="public", website=True)
      def index(self, **kw):
 +        page = 'homepage'
          try:
              main_menu = request.registry['ir.model.data'].get_object(request.cr, request.uid, 'website', 'main_menu')
 -            first_menu = main_menu.child_id and main_menu.child_id[0]
 -            # Dont 302 loop on /
 -            if first_menu and not ((first_menu.url == '/') or first_menu.url.startswith('/#') or first_menu.url.startswith('/?')):
 -                return request.redirect(first_menu.url)
 -        except:
 +        except Exception:
              pass
 -        return self.page("website.homepage")
 +        else:
 +            first_menu = main_menu.child_id and main_menu.child_id[0]
 +            if first_menu:
 +                if not (first_menu.url.startswith(('/page/', '/?', '/#')) or (first_menu.url=='/')):
 +                    return request.redirect(first_menu.url)
 +                if first_menu.url.startswith('/page/'):
 +                    page = first_menu.url[6:]
  
 -    @http.route(website=True, auth="public", multilang=True)
 +        return self.page(page)
 +
 +    @http.route(website=True, auth="public")
      def web_login(self, *args, **kw):
          # TODO: can't we just put auth=public, ... in web client ?
          return super(Website, self).web_login(*args, **kw)
  
 -    @http.route('/page/<path:page>', type='http', auth="public", website=True, multilang=True)
 +    @http.route('/page/<path:page>', type='http', auth="public", website=True)
      def page(self, page, **opt):
          values = {
              'path': page,
@@@ -62,7 -57,7 +62,7 @@@
              request.website.get_template(page)
          except ValueError, e:
              # page not found
 -            if request.context['editable']:
 +            if request.website.is_publisher():
                  page = 'website.page_404'
              else:
                  return request.registry['ir.http']._handle_exception(e, 404)
              locs = request.website.enumerate_pages()
              while True:
                  start = pages * LOC_PER_SITEMAP
 -                loc_slice = islice(locs, start, start + LOC_PER_SITEMAP)
 -                urls = iuv.render(cr, uid, 'website.sitemap_locs', dict(locs=loc_slice), context=context)
 +                values = {
 +                    'locs': islice(locs, start, start + LOC_PER_SITEMAP),
 +                    'url_root': request.httprequest.url_root[:-1],
 +                }
 +                urls = iuv.render(cr, uid, 'website.sitemap_locs', values, context=context)
                  if urls.strip():
                      page = iuv.render(cr, uid, 'website.sitemap_xml', dict(content=urls), context=context)
                      if not first_page:
      @http.route('/website/theme_change', type='http', auth="user", website=True)
      def theme_change(self, theme_id=False, **kwargs):
          imd = request.registry['ir.model.data']
 -        view = request.registry['ir.ui.view']
 +        Views = request.registry['ir.ui.view']
  
 -        view_model, view_option_id = imd.get_object_reference(
 +        _, theme_template_id = imd.get_object_reference(
              request.cr, request.uid, 'website', 'theme')
 -        views = view.search(
 -            request.cr, request.uid, [('inherit_id', '=', view_option_id)],
 -            context=request.context)
 -        view.write(request.cr, request.uid, views, {'inherit_id': False},
 -                   context=request.context)
 +        views = Views.search(request.cr, request.uid, [
 +            ('inherit_id', '=', theme_template_id),
 +            ('application', '=', 'enabled'),
 +        ], context=request.context)
 +        Views.write(request.cr, request.uid, views, {
 +            'application': 'disabled',
 +        }, context=request.context)
  
          if theme_id:
              module, xml_id = theme_id.split('.')
 -            view_model, view_id = imd.get_object_reference(
 +            _, view_id = imd.get_object_reference(
                  request.cr, request.uid, module, xml_id)
 -            view.write(request.cr, request.uid, [view_id],
 -                       {'inherit_id': view_option_id}, context=request.context)
 +            Views.write(request.cr, request.uid, [view_id], {
 +                'application': 'enabled'
 +            }, context=request.context)
  
          return request.render('website.themes', {'theme_changed': True})
  
          module_obj.button_immediate_upgrade(request.cr, request.uid, module_ids, context=request.context)
          return request.redirect(redirect)
  
 -    @http.route('/website/customize_template_toggle', type='json', auth='user', website=True)
 -    def customize_template_set(self, view_id):
 -        view_obj = request.registry.get("ir.ui.view")
 -        view = view_obj.browse(request.cr, request.uid, int(view_id),
 -                               context=request.context)
 -        if view.inherit_id:
 -            value = False
 -        else:
 -            value = view.inherit_option_id and view.inherit_option_id.id or False
 -        view_obj.write(request.cr, request.uid, [view_id], {
 -            'inherit_id': value
 -        }, context=request.context)
 -        return True
 -
      @http.route('/website/customize_template_get', type='json', auth='user', website=True)
 -    def customize_template_get(self, xml_id, optional=True):
 +    def customize_template_get(self, xml_id, full=False):
 +        """ Lists the templates customizing ``xml_id``. By default, only
 +        returns optional templates (which can be toggled on and off), if
 +        ``full=True`` returns all templates customizing ``xml_id``
 +        """
          imd = request.registry['ir.model.data']
          view_model, view_theme_id = imd.get_object_reference(
              request.cr, request.uid, 'website', 'theme')
  
 -        user = request.registry['res.users'].browse(request.cr, request.uid, request.uid, request.context)
 -        group_ids = [g.id for g in user.groups_id]
 +        user = request.registry['res.users']\
 +            .browse(request.cr, request.uid, request.uid, request.context)
 +        user_groups = set(user.groups_id)
  
 -        view = request.registry.get("ir.ui.view")
 -        views = view._views_get(request.cr, request.uid, xml_id, context=request.context)
 -        done = {}
 +        views = request.registry["ir.ui.view"]\
 +            ._views_get(request.cr, request.uid, xml_id, context=request.context)
 +        done = set()
          result = []
          for v in views:
 -            if v.groups_id and [g for g in v.groups_id if g.id not in group_ids]:
 +            if not user_groups.issuperset(v.groups_id):
                  continue
 -            if v.inherit_option_id and v.inherit_option_id.id != view_theme_id or not optional:
 -                if v.inherit_option_id.id not in done:
 +            if full or (v.application != 'always' and v.inherit_id.id != view_theme_id):
 +                if v.inherit_id not in done:
                      result.append({
 -                        'name': v.inherit_option_id.name,
 +                        'name': v.inherit_id.name,
                          'id': v.id,
                          'xml_id': v.xml_id,
                          'inherit_id': v.inherit_id.id,
                          'header': True,
                          'active': False
                      })
 -                    done[v.inherit_option_id.id] = True
 +                    done.add(v.inherit_id)
                  result.append({
                      'name': v.name,
                      'id': v.id,
                      'xml_id': v.xml_id,
                      'inherit_id': v.inherit_id.id,
                      'header': False,
 -                    'active': (v.inherit_id.id == v.inherit_option_id.id) or (not optional and v.inherit_id.id)
 +                    'active': v.application in ('always', 'enabled'),
                  })
          return result
  
      @http.route('/website/get_view_translations', type='json', auth='public', website=True)
      def get_view_translations(self, xml_id, lang=None):
          lang = lang or request.context.get('lang')
 -        views = self.customize_template_get(xml_id, optional=False)
 +        views = self.customize_template_get(xml_id, full=True)
          views_ids = [view.get('id') for view in views if view.get('active')]
          domain = [('type', '=', 'view'), ('res_id', 'in', views_ids), ('lang', '=', lang)]
          irt = request.registry.get('ir.translation')
          '/website/image',
          '/website/image/<model>/<id>/<field>'
          ], auth="public", website=True)
 -    def website_image(self, model, id, field, max_width=maxint, max_height=maxint):
 +    def website_image(self, model, id, field, max_width=None, max_height=None):
          """ Fetches the requested field and ensures it does not go above
          (max_width, max_height), resizing it if necessary.
  
 -        Resizing is bypassed if the object provides a $field_big, which will
 -        be interpreted as a pre-resized version of the base field.
 -
          If the record is not found or does not have the requested field,
          returns a placeholder image via :meth:`~.placeholder`.
  
              action = ServerActions.browse(cr, uid, action_id, context=context)
              if action.state == 'code' and action.website_published:
                  action_res = ServerActions.run(cr, uid, [action_id], context=context)
-                 if isinstance(action_res, Response):
+                 if isinstance(action_res, werkzeug.wrappers.Response):
                      res = action_res
          if res:
              return res
@@@ -1,16 -1,12 +1,17 @@@
  (function () {
      'use strict';
  
 +    if (!openerp.website.translatable) {
 +        // Temporary hack until the editor bar is moved to the web client
 +        return;
 +    }
 +
      var website = openerp.website;
      website.add_template_file('/website/static/src/xml/website.translator.xml');
      var nodialog = 'website_translator_nodialog';
  
      website.EditorBar.include({
+         do_not_translate : ['-','*','!'],
          events: _.extend({}, website.EditorBar.prototype.events, {
              'click a[data-action=edit_master]': 'edit_master',
          }),
                          node.className += ' oe_translatable_inprogress';
                  }
              } else {
-                 node.className += ' oe_translatable_todo';
+                 node.className += this.do_not_translate.indexOf(node.textContent.trim()) ? ' oe_translatable_todo' : '';
              }
              node.contentEditable = true;
              var nid = _.uniqueId();
@@@ -68,34 -68,12 +68,34 @@@ class view_custom(osv.osv)
          'arch': fields.text('View Architecture', required=True),
      }
  
 +    def name_get(self, cr, uid, ids, context=None):
 +        return [(rec.id, rec.user_id.name) for rec in self.browse(cr, uid, ids, context=context)]
 +
 +    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
 +        if args is None:
 +            args = []
 +        if name:
 +            ids = self.search(cr, user, [('user_id', operator, name)] + args, limit=limit)
 +            return self.name_get(cr, user, ids, context=context)
 +        return super(view_custom, self).name_search(cr, user, name, args=args, operator=operator, context=context, limit=limit)
 +
 +
      def _auto_init(self, cr, context=None):
          super(view_custom, self)._auto_init(cr, context)
          cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'ir_ui_view_custom_user_id_ref_id\'')
          if not cr.fetchone():
              cr.execute('CREATE INDEX ir_ui_view_custom_user_id_ref_id ON ir_ui_view_custom (user_id, ref_id)')
  
 +def _hasclass(context, *cls):
 +    """ Checks if the context node has all the classes passed as arguments
 +    """
 +    node_classes = set(context.context_node.attrib.get('class', '').split())
 +
 +    return node_classes.issuperset(cls)
 +
 +xpath_utils = etree.FunctionNamespace(None)
 +xpath_utils['hasclass'] = _hasclass
 +
  class view(osv.osv):
      _name = 'ir.ui.view'
  
          'groups_id': fields.many2many('res.groups', 'ir_ui_view_group_rel', 'view_id', 'group_id',
              string='Groups', help="If this field is empty, the view applies to all users. Otherwise, the view applies to the users of those groups only."),
          'model_ids': fields.one2many('ir.model.data', 'res_id', domain=[('model','=','ir.ui.view')], auto_join=True),
 +        'create_date': fields.datetime('Create Date', readonly=True),
 +        'write_date': fields.datetime('Last Modification Date', readonly=True),
 +
 +        'mode': fields.selection(
 +            [('primary', "Base view"), ('extension', "Extension View")],
 +            string="View inheritance mode", required=True,
 +            help="""Only applies if this view inherits from an other one (inherit_id is not False/Null).
 +
 +* if extension (default), if this view is requested the closest primary view
 +  is looked up (via inherit_id), then all views inheriting from it with this
 +  view's model are applied
 +* if primary, the closest primary view is fully resolved (even if it uses a
 +  different model than this one), then this view's inheritance specs
 +  (<xpath/>) are applied, and the result is used as if it were this view's
 +  actual arch.
 +"""),
 +        'application': fields.selection([
 +                ('always', "Always applied"),
 +                ('enabled', "Optional, enabled"),
 +                ('disabled', "Optional, disabled"),
 +            ],
 +            required=True, string="Application status",
 +            help="""If this view is inherited,
 +* if always, the view always extends its parent
 +* if enabled, the view currently extends its parent but can be disabled
 +* if disabled, the view currently does not extend its parent but can be enabled
 +             """),
      }
      _defaults = {
 +        'mode': 'primary',
 +        'application': 'always',
          'priority': 16,
      }
      _order = "priority,name"
                          return False
          return True
  
 +    _sql_constraints = [
 +        ('inheritance_mode',
 +         "CHECK (mode != 'extension' OR inherit_id IS NOT NULL)",
 +         "Invalid inheritance mode: if the mode is 'extension', the view must"
 +         " extend an other view"),
 +    ]
      _constraints = [
 -        (_check_xml, 'Invalid view definition', ['arch'])
 +        (_check_xml, 'Invalid view definition', ['arch']),
      ]
  
      def _auto_init(self, cr, context=None):
          if not cr.fetchone():
              cr.execute('CREATE INDEX ir_ui_view_model_type_inherit_id ON ir_ui_view (model, inherit_id)')
  
 +    def _compute_defaults(self, cr, uid, values, context=None):
 +        if 'inherit_id' in values:
 +            values.setdefault(
 +                'mode', 'extension' if values['inherit_id'] else 'primary')
 +        return values
 +
      def create(self, cr, uid, values, context=None):
          if 'type' not in values:
              if values.get('inherit_id'):
                  values['type'] = etree.fromstring(values['arch']).tag
  
          if not values.get('name'):
 -            values['name'] = "%s %s" % (values['model'], values['type'])
 +            values['name'] = "%s %s" % (values.get('model'), values['type'])
  
          self.read_template.clear_cache(self)
 -        return super(view, self).create(cr, uid, values, context)
 +        return super(view, self).create(
 +            cr, uid,
 +            self._compute_defaults(cr, uid, values, context=context),
 +            context=context)
  
      def write(self, cr, uid, ids, vals, context=None):
          if not isinstance(ids, (list, tuple)):
          if custom_view_ids:
              self.pool.get('ir.ui.view.custom').unlink(cr, uid, custom_view_ids)
  
 +        if vals.get('application') == 'disabled':
 +            from_always = self.search(
 +                cr, uid, [('id', 'in', ids), ('application', '=', 'always')], context=context)
 +            if from_always:
 +                raise ValueError(
 +                    "Can't disable views %s marked as always applied" % (
 +                        ', '.join(map(str, from_always))))
 +
          self.read_template.clear_cache(self)
 -        ret = super(view, self).write(cr, uid, ids, vals, context)
 +        ret = super(view, self).write(
 +            cr, uid, ids,
 +            self._compute_defaults(cr, uid, vals, context=context),
 +            context)
          return ret
  
 +    def toggle(self, cr, uid, ids, context=None):
 +        """ Switches between enabled and disabled application statuses
 +        """
 +        for view in self.browse(cr, uid, ids, context=context):
 +            if view.application == 'enabled':
 +                view.write({'application': 'disabled'})
 +            elif view.application == 'disabled':
 +                view.write({'application': 'enabled'})
 +            else:
 +                raise ValueError(_("Can't toggle view %d with application %r") % (
 +                    view.id,
 +                    view.application,
 +                ))
 +
 +
      def copy(self, cr, uid, id, default=None, context=None):
          if not default:
              default = {}
      # default view selection
      def default_view(self, cr, uid, model, view_type, context=None):
          """ Fetches the default view for the provided (model, view_type) pair:
 -         view with no parent (inherit_id=Fase) with the lowest priority.
 +         primary view with the lowest priority.
  
          :param str model:
          :param int view_type:
          domain = [
              ['model', '=', model],
              ['type', '=', view_type],
 -            ['inherit_id', '=', False],
 +            ['mode', '=', 'primary'],
          ]
          ids = self.search(cr, uid, domain, limit=1, context=context)
          if not ids:
             :return: [(view_arch,view_id), ...]
          """
  
 -        user_groups = frozenset(self.pool.get('res.users').browse(cr, 1, uid, context).groups_id)
 +        user = self.pool['res.users'].browse(cr, 1, uid, context=context)
 +        user_groups = frozenset(user.groups_id or ())
  
 -        check_view_ids = context and context.get('check_view_ids') or (0,)
 -        conditions = [['inherit_id', '=', view_id], ['model', '=', model]]
 +        conditions = [
 +            ['inherit_id', '=', view_id],
 +            ['model', '=', model],
 +            ['mode', '=', 'extension'],
 +            ['application', 'in', ['always', 'enabled']],
 +        ]
          if self.pool._init:
              # Module init currently in progress, only consider views from
              # modules whose code is already loaded
              conditions.extend([
                  '|',
                  ['model_ids.module', 'in', tuple(self.pool._init_modules)],
 -                ['id', 'in', check_view_ids],
 +                ['id', 'in', context and context.get('check_view_ids') or (0,)],
              ])
          view_ids = self.search(cr, uid, conditions, context=context)
  
                          node.getparent().remove(node)
                  elif pos == 'attributes':
                      for child in spec.getiterator('attribute'):
-                         attribute = (child.get('name'), child.text and child.text.encode('utf8') or None)
+                         attribute = (child.get('name'), child.text or None)
                          if attribute[1]:
                              node.set(attribute[0], attribute[1])
                          elif attribute[0] in node.attrib:
          if context is None: context = {}
          if root_id is None:
              root_id = source_id
 -        sql_inherit = self.pool.get('ir.ui.view').get_inheriting_views_arch(cr, uid, source_id, model, context=context)
 +        sql_inherit = self.pool['ir.ui.view'].get_inheriting_views_arch(cr, uid, source_id, model, context=context)
          for (specs, view_id) in sql_inherit:
              specs_tree = etree.fromstring(specs.encode('utf-8'))
              if context.get('inherit_branding'):
  
          # if view_id is not a root view, climb back to the top.
          base = v = self.browse(cr, uid, view_id, context=context)
 -        while v.inherit_id:
 +        while v.mode != 'primary':
              v = v.inherit_id
          root_id = v.id
  
  
          # read the view arch
          [view] = self.read(cr, uid, [root_id], fields=fields, context=context)
 -        arch_tree = etree.fromstring(view['arch'].encode('utf-8'))
 +        view_arch = etree.fromstring(view['arch'].encode('utf-8'))
 +        if not v.inherit_id:
 +            arch_tree = view_arch
 +        else:
 +            parent_view = self.read_combined(
 +                cr, uid, v.inherit_id.id, fields=fields, context=context)
 +            arch_tree = etree.fromstring(parent_view['arch'])
 +            self.apply_inheritance_specs(
 +                cr, uid, arch_tree, view_arch, parent_view['id'], context=context)
 +
  
          if context.get('inherit_branding'):
              arch_tree.attrib.update({
              for action, operation in (('create', 'create'), ('delete', 'unlink'), ('edit', 'write')):
                  if not node.get(action) and not Model.check_access_rights(cr, user, operation, raise_exception=False):
                      node.set(action, 'false')
 +        if node.tag in ('kanban'):
 +            group_by_field = node.get('default_group_by')
 +            if group_by_field and Model._all_columns.get(group_by_field):
 +                group_by_column = Model._all_columns[group_by_field].column
 +                if group_by_column._type == 'many2one':
 +                    group_by_model = Model.pool.get(group_by_column._obj)
 +                    for action, operation in (('group_create', 'create'), ('group_delete', 'unlink'), ('group_edit', 'write')):
 +                        if not node.get(action) and not group_by_model.check_access_rights(cr, user, operation, raise_exception=False):
 +                            node.set(action, 'false')
 +
          arch = etree.tostring(node, encoding="utf-8").replace('\t', '')
          for k in fields.keys():
              if k not in fields_def:
              values = dict()
          qcontext = dict(
              keep_query=keep_query,
 -            request=request,
 +            request=request, # might be unbound if we're not in an httprequest context
 +            debug=request.debug if request else False,
              json=simplejson,
              quote_plus=werkzeug.url_quote_plus,
              time=time,
              relativedelta=relativedelta,
          )
          qcontext.update(values)
 +
 +        # TODO: remove this as soon as the following branch is merged
 +        #       lp:~openerp-dev/openerp-web/trunk-module-closure-style-msh
 +        from openerp.addons.web.controllers.main import module_boot
 +        qcontext['modules'] = simplejson.dumps(module_boot()) if request else None
  
          def loader(name):
              return self.read_template(cr, uid, name, context=context)