Merge lp:~camptocamp/openobject-addons/ocb-6.1-fix_1311004_account_move_line_index-afe into lp:openobject-addons/6.1

[Alexandre Fayolle - camptocamp]

improve reading account_move_lines by using an index on date, id matching _order

port of https://code.launchpad.net/~camptocamp/openobject-addons/6.1-fix_1311004_account_move_line_index-afe/+merge/216687 to OCB (6.1)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve (code review)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

It seems other revisions were dragged in.

Is it wanted ?

review: Needs Resubmitting

Unmerged revisions

6841. By Alexandre Fayolle - camptocamp on 2014-04-22

[IMP] add an index on account_move_line(date, id)

6840. By 开阖软件 Jeff Wang on 2014-03-21

Pricelist base on supplierinfo based price list returns zero

6839. By Yann Papouin on 2014-03-17

[IMP] Partner linked to newly created task

6838. By Yann Papouin on 2014-03-14

[MRG] fix Services with 'Make to stock' procure_method stay in 'Running' state

6837. By Yann Papouin on 2014-02-21

[FIX] Do not duplicate origin when merging purchase orders

6836. By Yann Papouin on 2014-02-20

Locations of a production order are set from stock properties by default

6835. By Holger Brunn (Therp) on 2014-02-14

[FIX] lp:1237832, recurse into analytic account's children when calculating practical amount in budgets

6834. By Rifakat Husen (OpenERP) on 2014-02-10

[FIX] BoM does not validate field active nor dates

6833. By Yann Papouin on 2014-02-10

[FIX] invalid product ID when using variants

6832. By Ravish(OpenERP) on 2014-02-10

[FIX] procurement prioritization

=== modified file 'account/__init__.py'
--- account/__init__.py	2011-12-30 11:44:10 +0000
+++ account/__init__.py	2014-04-22 12:10:57 +0000
@@ -23,6 +23,7 @@
 import installer
 import project
 import partner
+import company
 import account_invoice
 import account_bank_statement
 import account_bank
@@ -34,7 +35,6 @@
 import report
 import product
 import ir_sequence
-import company
 import res_currency
 import edi
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/account.py'
--- account/account.py	2013-01-23 10:11:30 +0000
+++ account/account.py	2014-04-22 12:10:57 +0000
@@ -29,6 +29,7 @@
 from osv import fields, osv
 import decimal_precision as dp
 from tools.translate import _
+from openerp.tools.float_utils import float_round
 
 def check_cycle(self, cr, uid, ids, context=None):
     """ climbs the ``self._table.parent_id`` chains for 100 levels or
@@ -106,7 +107,7 @@
         'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \
             "If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."),
         'days2': fields.integer('Day of the Month', required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."),
-        'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=True, select=True),
+        'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=True, select=True, ondelete='cascade'),
     }
     _defaults = {
         'value': 'balance',
@@ -1396,7 +1397,7 @@
                 if not l[0]:
                     l[2].update({
                         'reconcile_id':False,
-                        'reconcil_partial_id':False,
+                        'reconcile_partial_id':False,
                         'analytic_lines':False,
                         'invoice':False,
                         'ref':False,
@@ -1523,7 +1524,13 @@
         cr.execute('update account_move_line set '+mode2+'=%s where id=%s', (result, line_id))
 
         #adjust also the amount in currency if needed
-        cr.execute("select currency_id, sum(amount_currency) as amount_currency from account_move_line where move_id = %s and currency_id is not null group by currency_id", (move.id,))
+        cr.execute(
+            '''select currency_id, sum(amount_currency) as amount_currency
+               from account_move_line
+               where move_id = %s
+                 and currency_id is not null
+                 and amount_currency is not null
+               group by currency_id''', (move.id,))
         for row in cr.dictfetchall():
             currency_id = currency_obj.browse(cr, uid, row['currency_id'], context=context)
             if not currency_obj.is_zero(cr, uid, currency_id, row['amount_currency']):
@@ -1855,6 +1862,14 @@
             return result in the context
             Ex: result=round(price_unit*0.21,4)
     """
+ 
+    def copy_data(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {} 
+        name = self.read(cr, uid, id, ['name'], context=context)['name']
+        default = default.copy()
+        default.update({'name': name + _(' (Copy)')})
+        return super(account_tax, self).copy_data(cr, uid, id, default=default, context=context)    
 
     def get_precision_tax():
         def change_digit_tax(cr):
@@ -2070,7 +2085,9 @@
                 cur_price_unit+=amount2
         return res
 
-    def compute_all(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None, force_excluded=False):
+    def compute_all(self, cr, uid, taxes, price_unit, quantity,
+            address_id=None, product=None, partner=None, force_excluded=False,
+            context=None):
         """
         :param force_excluded: boolean used to say that we don't want to consider the value of field price_include of
             tax. It's used in encoding by line where you don't matter if you encoded a tax with that boolean to True or
@@ -2081,8 +2098,25 @@
                 'taxes': []                  # List of taxes, see compute for the format
             }
         """
+
+        # By default, for each tax, tax amount will first be computed
+        # and rounded at the 'Account' decimal precision for each
+        # PO/SO/invoice line and then these rounded amounts will be
+        # summed, leading to the total amount for that tax. But, if the
+        # company has tax_calculation_rounding_method = round_globally,
+        # we still follow the same method, but we use a much larger
+        # precision when we round the tax amount for each line (we use
+        # the 'Account' decimal precision + 5), and that way it's like
+        # rounding after the sum of the tax amounts of each line
         precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
-        totalin = totalex = round(price_unit * quantity, precision)
+        tax_compute_precision = precision
+        rounding_method = (
+            (context and context.get('tax_calculation_rounding_method'))
+            or (taxes and taxes[0].company_id.tax_calculation_rounding_method)
+            or 'round_per_line')
+        if  rounding_method == 'round_globally':
+            tax_compute_precision += 5
+        totalin = totalex = float_round(price_unit * quantity, precision)
         tin = []
         tex = []
         for tax in taxes:
@@ -2090,7 +2124,7 @@
                 tex.append(tax)
             else:
                 tin.append(tax)
-        tin = self.compute_inv(cr, uid, tin, price_unit, quantity, address_id=address_id, product=product, partner=partner)
+        tin = self.compute_inv(cr, uid, tin, price_unit, quantity, address_id=address_id, product=product, partner=partner, precision=tax_compute_precision)
         for r in tin:
             totalex -= r.get('amount', 0.0)
         totlex_qty = 0.0
@@ -2098,7 +2132,7 @@
             totlex_qty = totalex/quantity
         except:
             pass
-        tex = self._compute(cr, uid, tex, totlex_qty, quantity, address_id=address_id, product=product, partner=partner)
+        tex = self._compute(cr, uid, tex, totlex_qty, quantity, address_id=address_id, product=product, partner=partner, precision=tax_compute_precision)
         for r in tex:
             totalin += r.get('amount', 0.0)
         return {
@@ -2113,7 +2147,7 @@
             "Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
         return self._compute(cr, uid, taxes, price_unit, quantity, address_id, product, partner)
 
-    def _compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+    def _compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None, precision=None):
         """
         Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
 
@@ -2122,14 +2156,15 @@
             tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
             one tax for each tax id in IDS and their children
         """
+        if not precision:
+            precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
         res = self._unit_compute(cr, uid, taxes, price_unit, address_id, product, partner, quantity)
         total = 0.0
-        precision_pool = self.pool.get('decimal.precision')
         for r in res:
             if r.get('balance',False):
-                r['amount'] = round(r.get('balance', 0.0) * quantity, precision_pool.precision_get(cr, uid, 'Account')) - total
+                r['amount'] = round(r.get('balance', 0.0) * quantity, precision) - total
             else:
-                r['amount'] = round(r.get('amount', 0.0) * quantity, precision_pool.precision_get(cr, uid, 'Account'))
+                r['amount'] = round(r.get('amount', 0.0) * quantity, precision)
                 total += r['amount']
         return res
 
@@ -2207,7 +2242,7 @@
             r['todo'] = 0
         return res
 
-    def compute_inv(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+    def compute_inv(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None, precision=None):
         """
         Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
         Price Unit is a VAT included price
@@ -2217,15 +2252,15 @@
             tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
             one tax for each tax id in IDS and their children
         """
+        if not precision:
+            precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
         res = self._unit_compute_inv(cr, uid, taxes, price_unit, address_id, product, partner=None)
         total = 0.0
-        obj_precision = self.pool.get('decimal.precision')
         for r in res:
-            prec = obj_precision.precision_get(cr, uid, 'Account')
             if r.get('balance',False):
-                r['amount'] = round(r['balance'] * quantity, prec) - total
+                r['amount'] = round(r['balance'] * quantity, precision) - total
             else:
-                r['amount'] = round(r['amount'] * quantity, prec)
+                r['amount'] = round(r['amount'] * quantity, precision)
                 total += r['amount']
         return res
 
@@ -2323,6 +2358,14 @@
 
         return move_ids
 
+    def onchange_journal_id(self, cr, uid, ids, journal_id, context=None):
+        company_id = False
+        if journal_id:
+            journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
+            if journal.company_id.id:
+                company_id = journal.company_id.id
+        return {'value': {'company_id': company_id}}
+
 account_model()
 
 class account_model_line(osv.osv):
 
=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2013-01-31 10:22:57 +0000
+++ account/account_invoice.py	2014-04-22 12:10:57 +0000
@@ -91,19 +91,44 @@
         return [('none', _('Free Reference'))]
 
     def _amount_residual(self, cr, uid, ids, name, args, context=None):
+        if context is None:
+            context = {}
+        ctx = context.copy()
         result = {}
+        currency_obj = self.pool.get('res.currency')
         for invoice in self.browse(cr, uid, ids, context=context):
-            checked_partial_rec_ids = []
+            nb_inv_in_partial_rec = max_invoice_id = 0
             result[invoice.id] = 0.0
             if invoice.move_id:
-                for move_line in invoice.move_id.line_id:
-                    if move_line.account_id.type in ('receivable','payable'):
-                        if move_line.reconcile_partial_id:
-                            partial_reconcile_id = move_line.reconcile_partial_id.id
-                            if partial_reconcile_id in checked_partial_rec_ids:
-                                continue
-                            checked_partial_rec_ids.append(partial_reconcile_id)
-                        result[invoice.id] += move_line.amount_residual_currency
+                for aml in invoice.move_id.line_id:
+                    if aml.account_id.type in ('receivable','payable'):
+                        if aml.currency_id and aml.currency_id.id == invoice.currency_id.id:
+                            result[invoice.id] += aml.amount_residual_currency
+                        else:
+                            ctx['date'] = aml.date
+                            result[invoice.id] += currency_obj.compute(cr, uid, aml.company_id.currency_id.id, invoice.currency_id.id, aml.amount_residual, context=ctx)
+
+                        if aml.reconcile_partial_id.line_partial_ids:
+                            #we check if the invoice is partially reconciled and if there are other invoices
+                            #involved in this partial reconciliation (and we sum these invoices)
+                            for line in aml.reconcile_partial_id.line_partial_ids:
+                                if line.invoice:
+                                    nb_inv_in_partial_rec += 1
+                                    #store the max invoice id as for this invoice we will make a balance instead of a simple division
+                                    max_invoice_id = max(max_invoice_id, line.invoice.id)
+            if nb_inv_in_partial_rec:
+                #if there are several invoices in a partial reconciliation, we split the residual by the number
+                #of invoice to have a sum of residual amounts that matches the partner balance
+                new_value = currency_obj.round(cr, uid, invoice.currency_id, result[invoice.id] / nb_inv_in_partial_rec)
+                if invoice.id == max_invoice_id:
+                    #if it's the last the invoice of the bunch of invoices partially reconciled together, we make a
+                    #balance to avoid rounding errors
+                    result[invoice.id] = result[invoice.id] - ((nb_inv_in_partial_rec - 1) * new_value)
+                else:
+                    result[invoice.id] = new_value
+
+            #prevent the residual amount on the invoice to be less than 0
+            result[invoice.id] = max(result[invoice.id], 0.0)
         return result
 
     # Give Journal Items related to the payment reconciled to this invoice
@@ -284,8 +309,40 @@
         'payment_ids': fields.function(_compute_lines, relation='account.move.line', type="many2many", string='Payments'),
         'move_name': fields.char('Journal Entry', size=64, readonly=True, states={'draft':[('readonly',False)]}),
         'user_id': fields.many2one('res.users', 'Salesman', readonly=True, states={'draft':[('readonly',False)]}),
-        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]})
+        'fiscal_position': fields.many2one('account.fiscal.position',
+            'Fiscal Position', readonly=True,
+            states={'draft':[('readonly',False)]}),
+        'tax_calculation_rounding_method': fields.selection([
+            ('round_per_line', 'Round per line'),
+            ('round_globally', 'Round globally'),
+            ], 'Tax calculation rounding method',
+            help='''If you select 'Round per line' : for each tax, the tax
+amount will first be computed and rounded for each PO/SO/invoice line and then
+these rounded amounts will be summed, leading to the total amount for that tax.
+If you select 'Round globally': for each tax, the tax amount will be computed
+for each PO/SO/invoice line, then these amounts will be summed and eventually
+this total tax amount will be rounded. If you sell with tax included, you
+should choose 'Round per line' because you certainly want the sum of your
+tax-included line subtotals to be equal to the total amount with taxes.'''),
     }
+
+    def _get_company_rounding(self, cr, uid, company_id, context=None):
+        res = 'round_per_line'
+        if  company_id:
+            company_model = self.pool.get('res.company')
+            company_obj = company_model.browse(
+                cr, uid, company_id, context=context)
+            if  company_obj and company_obj['tax_calculation_rounding_method']:
+                res = company_obj['tax_calculation_rounding_method']
+        return res
+
+    def _get_default_rounding_method(self, cr, uid, context=None):
+        # default rounding depends on company. We start with default company
+        company_model = self.pool.get('res.company')
+        company_id = company_model._company_default_get(
+            cr, uid, 'account.invoice', context=context)
+        return self._get_company_rounding(cr, uid, company_id, context)
+
     _defaults = {
         'type': _get_type,
         'state': 'draft',
@@ -296,6 +353,7 @@
         'check_total': 0.0,
         'internal_number': False,
         'user_id': lambda s, cr, u, c: u,
+        'tax_calculation_rounding_method': _get_default_rounding_method,
     }
     _sql_constraints = [
         ('number_uniq', 'unique(number, company_id, journal_id, type)', 'Invoice Number must be unique per Company!'),
@@ -516,6 +574,9 @@
         obj_journal = self.pool.get('account.journal')
         account_obj = self.pool.get('account.account')
         inv_line_obj = self.pool.get('account.invoice.line')
+        if  company_id:
+            val['tax_calculation_rounding_method'] = (
+                self._get_company_rounding(cr, uid, company_id))
         if company_id and part_id and type:
             acc_id = False
             partner_obj = self.pool.get('res.partner').browse(cr,uid,part_id)
@@ -1026,6 +1087,23 @@
                 self.log(cr, uid, inv_id, message, context=ctx)
         return True
 
+    def action_proforma(self, cr, uid, ids, context=None):
+        """
+        Check if all taxes are present with the correct base amount
+        on creating a proforma invoice. This leaves room for manual
+        corrections of the tax amount.
+        """
+        if not ids:
+            return True
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        ait_obj = self.pool.get('account.invoice.tax')
+        for inv in self.browse(cr, uid, ids, context=context):
+            compute_taxes = ait_obj.compute(cr, uid, inv.id, context=context)
+            self.check_tax_lines(cr, uid, inv, compute_taxes, ait_obj)
+        return self.write(
+            cr, uid, ids, {'state': 'proforma2'}, context=context)
+
     def action_cancel(self, cr, uid, ids, *args):
         context = {} # TODO: Use context from arguments
         account_move_obj = self.pool.get('account.move')
@@ -1268,9 +1346,17 @@
         res = {}
         tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
+        local_context = {}
         for line in self.browse(cr, uid, ids):
             price = line.price_unit * (1-(line.discount or 0.0)/100.0)
-            taxes = tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, price, line.quantity, product=line.product_id, address_id=line.invoice_id.address_invoice_id, partner=line.invoice_id.partner_id)
+            local_context['tax_calculation_rounding_method'] = (
+                    line.invoice_id.tax_calculation_rounding_method)
+            taxes = tax_obj.compute_all(
+                cr, uid, line.invoice_line_tax_id, price, line.quantity,
+                product=line.product_id,
+                address_id=line.invoice_id.address_invoice_id,
+                partner=line.invoice_id.partner_id,
+                context=local_context)
             res[line.id] = taxes['total']
             if line.invoice_id:
                 cur = line.invoice_id.currency_id
@@ -1380,11 +1466,19 @@
         else:
             taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
         tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
-
-        if type in ('in_invoice', 'in_refund'):
-            result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} )
-        else:
-            result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id})
+        result['invoice_line_tax_id'] = tax_id
+
+        warning = {}
+        # When product changes, price ALWAYS need to be reset. If not price
+        # found in product, or pricelist, it should become False. Only if
+        # product_id has been cleared by user, we will leave price_unit as is.
+        if  product:
+            price_unit, pu_warning = self._price_unit_get(
+                cr, uid, product, uom, qty, type, partner_id,
+                currency_id, context=context)
+            result['price_unit'] = price_unit  # might be False
+            warning.update(pu_warning)
+
         result['name'] = res.partner_ref
 
         domain = {}
@@ -1395,27 +1489,88 @@
             if res2:
                 domain = {'uos_id':[('category_id','=',res2 )]}
 
-        res_final = {'value':result, 'domain':domain}
-
-        if not company_id or not currency_id:
-            return res_final
-
-        company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
-        currency = self.pool.get('res.currency').browse(cr, uid, currency_id, context=context)
-
-        if company.currency_id.id != currency.id:
-            if type in ('in_invoice', 'in_refund'):
-                res_final['value']['price_unit'] = res.standard_price
-            new_price = res_final['value']['price_unit'] * currency.rate
-            res_final['value']['price_unit'] = new_price
-
-        if uom:
-            uom = self.pool.get('product.uom').browse(cr, uid, uom, context=context)
-            if res.uom_id.category_id.id == uom.category_id.id:
-                new_price = res_final['value']['price_unit'] * uom.factor_inv
-                res_final['value']['price_unit'] = new_price
+        res_final = {'value': result, 'domain': domain, 'warning': warning}
         return res_final
 
+    def _price_unit_get(
+            self, cr, uid, product_id, uom_id, qty, invoice_type, partner_id,
+            currency_id, context=None):
+        price_unit = False
+        warning = {}
+        standard_currency_id = currency_id
+        partner_model = self.pool.get('res.partner')
+        partner_obj = partner_model.browse(
+            cr, uid, partner_id, context=context)
+        assert partner_obj, _('No partner found for id %d') % partner_id
+        if invoice_type in ('in_invoice', 'in_refund'):
+            field = 'list_price'
+            pricelist_property = 'property_product_pricelist_purchase'
+        else:
+            field = 'standard_price'
+            pricelist_property = 'property_product_pricelist'
+        if  pricelist_property in partner_obj:
+            pricelist_id = partner_obj[pricelist_property].id
+        else:
+            pricelist_id = False
+        # Check whether standard price p.u. modified by pricelist
+        if  pricelist_id:
+            pricelist_model = self.pool.get('product.pricelist')
+            price_unit = pricelist_model.price_get(
+                cr, uid, [pricelist_id], product_id, qty or 1.0, partner_id,
+                {'uom': uom_id})[pricelist_id]
+            if  price_unit is False:  # 0.0 is OK, we night have free products
+                warning = {
+                   'title': _('No valid pricelist line found!'),
+                   'message':
+                    _("Couldn't find a pricelist line matching this product"
+                    " and quantity.\n"
+                    "You have to change either the product, the quantity or"
+                    " the pricelist.")
+                }
+            # Pricelist converts price from standard currency to pricelist
+            # currency. We have to convert this to the invoice currency.
+            # In practice that will often mean undoing the conversion
+            # done by the pricelist object
+            pricelist_obj = pricelist_model.browse(cr, uid, pricelist_id)
+            if  (pricelist_obj and pricelist_obj.currency_id and
+                 pricelist_obj.currency_id.id):
+                standard_currency_id = pricelist_obj.currency_id.id
+        else:
+            # Take standard price per unit directly from product
+            product_model = self.pool.get('product.product')
+            product_obj = product_model.browse(
+                cr, uid, product_id, context=context)
+            assert product_obj, _('No product found for id %d') % product_id
+            assert field in product_obj, _(
+                'Field %s not found in product') % field
+            price_unit = product_obj[field]
+            # If price_unit not taken from price-list, we still have to
+            # take unit of measurement into account
+            if  uom_id:
+                uom_model = self.pool.get('product.uom')
+                uom_obj = uom_model.browse(cr, uid, uom_id)
+                p_uom_category_id = product_obj.uom_id.category_id.id
+                if  p_uom_category_id == uom_obj.category_id.id:
+                    price_unit = price_unit * uom_obj.factor_inv
+            # When price not taken from pricelist, the currency is
+            # determined by the price_type:
+            price_type_model = self.pool.get('product.price.type')
+            price_type_ids = price_type_model.search(
+                cr, uid, [('field', '=', field)])
+            if  price_type_ids:
+                price_type_obj = price_type_model.browse(
+                    cr, uid, price_type_ids[0])
+                if  (price_type_obj and price_type_obj.currency_id and
+                     price_type_obj.currency_id.id):
+                    standard_currency_id = price_type_obj.currency_id.id
+        # convert price_unit to currency of invoice
+        if  standard_currency_id != currency_id:
+            currency_model = self.pool.get('res.currency')
+            price_unit = currency_model.compute(
+                cr, uid, standard_currency_id, currency_id,
+                price_unit, round=True, context=context)
+        return price_unit, warning
+
     def uos_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None, company_id=None):
         if context is None:
             context = {}
@@ -1448,6 +1603,10 @@
         inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
         company_currency = inv.company_id.currency_id.id
 
+        local_context = {
+            'tax_calculation_rounding_method':
+                inv.tax_calculation_rounding_method
+        }
         for line in inv.invoice_line:
             mres = self.move_line_get_item(cr, uid, line, context)
             if not mres:
@@ -1457,7 +1616,7 @@
             for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id,
                     (line.price_unit * (1.0 - (line['discount'] or 0.0) / 100.0)),
                     line.quantity, inv.address_invoice_id.id, line.product_id,
-                    inv.partner_id)['taxes']:
+                    inv.partner_id, context=local_context)['taxes']:
 
                 if inv.type in ('out_invoice', 'in_invoice'):
                     tax_code_id = tax['base_code_id']
@@ -1596,16 +1755,23 @@
         cur = inv.currency_id
         company_currency = inv.company_id.currency_id.id
 
+        local_context = {
+            'tax_calculation_rounding_method':
+                inv.tax_calculation_rounding_method
+        }
         for line in inv.invoice_line:
-            for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id)['taxes']:
-                tax['price_unit'] = cur_obj.round(cr, uid, cur, tax['price_unit'])
+            for tax in tax_obj.compute_all(
+                    cr, uid, line.invoice_line_tax_id,
+                    (line.price_unit * (1 - (line.discount or 0.0) / 100.0)),
+                    line.quantity, inv.address_invoice_id.id, line.product_id,
+                    inv.partner_id, context=local_context)['taxes']:
                 val={}
                 val['invoice_id'] = inv.id
                 val['name'] = tax['name']
                 val['amount'] = tax['amount']
                 val['manual'] = False
                 val['sequence'] = tax['sequence']
-                val['base'] = tax['price_unit'] * line['quantity']
+                val['base'] = cur_obj.round(cr, uid, cur, tax['price_unit'] * line['quantity']) 
 
                 if inv.type in ('out_invoice','in_invoice'):
                     val['base_code_id'] = tax['base_code_id']
 
=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2012-02-16 18:50:48 +0000
+++ account/account_invoice_view.xml	2014-04-22 12:10:57 +0000
@@ -168,6 +168,7 @@
                             <field name="reference_type" nolabel="1" size="0"/>
                             <field name="reference" nolabel="1"/>
                             <field name="date_due"/>
+                            <field name="tax_calculation_rounding_method"/>
                             <field colspan="4" context="{'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line" nolabel="1">
                                 <tree string="Invoice lines">
                                     <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, context, parent.company_id)"/>
@@ -259,6 +260,9 @@
                     <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
                     <field name="number"/>
                     <field name="type" invisible="1"/>
+                    <field
+                        name="tax_calculation_rounding_method"
+                        invisible="1" />
                     <field name="currency_id" width="50"/>
                     <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                     <newline/>
@@ -292,7 +296,7 @@
                             </group>
                             <group col="4" colspan="2">
                                 <group colspan="2" col="1">
-                                    <button name="button_reset_taxes" states="draft,proforma2" string="Compute Taxes" type="object" groups="base.group_user" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
+                                    <button name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" groups="base.group_user" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
                                 </group>
                                 <field name="amount_untaxed"/>
                                 <label string="" colspan="2"/>
 
=== modified file 'account/account_invoice_workflow.xml'
--- account/account_invoice_workflow.xml	2011-01-14 00:11:01 +0000
+++ account/account_invoice_workflow.xml	2014-04-22 12:10:57 +0000
@@ -17,7 +17,7 @@
         <record id="act_proforma2" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">proforma2</field>
-            <field name="action">write({'state':'proforma2'})</field>
+            <field name="action">action_proforma()</field>
             <field name="kind">function</field>
         </record>
 
 
=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2014-01-10 15:40:23 +0000
+++ account/account_move_line.py	2014-04-22 12:10:57 +0000
@@ -567,6 +567,9 @@
         cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'account_move_line_journal_id_period_id_index\'')
         if not cr.fetchone():
             cr.execute('CREATE INDEX account_move_line_journal_id_period_id_index ON account_move_line (journal_id, period_id)')
+        cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = %s', ('account_move_line_date_id_index',))
+        if not cr.fetchone():
+            cr.execute('CREATE INDEX account_move_line_date_id_index ON account_move_line (date DESC, id desc)')
 
     def _check_no_view(self, cr, uid, ids, context=None):
         lines = self.browse(cr, uid, ids, context=context)
 
=== modified file 'account/account_view.xml'
--- account/account_view.xml	2013-03-13 09:17:04 +0000
+++ account/account_view.xml	2014-04-22 12:10:57 +0000
@@ -1703,7 +1703,7 @@
                     <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
                     <separator orientation="vertical"/>
                       <field name="name"/>
-                      <field name="journal_id" widget="selection"/>
+                      <field name="journal_id" on_change="onchange_journal_id(journal_id)"/>
                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
 
=== modified file 'account/company.py'
--- account/company.py	2011-11-16 13:43:36 +0000
+++ account/company.py	2014-04-22 12:10:57 +0000
@@ -24,6 +24,11 @@
 class res_company(osv.osv):
     _inherit = "res.company"
     _columns = {
+        'tax_calculation_rounding_method': fields.selection([
+            ('round_per_line', 'Round per line'),
+            ('round_globally', 'Round globally'),
+            ], 'Tax calculation rounding method',
+            help="If you select 'Round per line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
         'paypal_account': fields.char("Paypal Account", size=128, help="Paypal username (usually email) for receiving online payments."),
         'overdue_msg': fields.text('Overdue Payments Message', translate=True),
         'property_reserve_and_surplus_account': fields.property(
@@ -41,7 +46,8 @@
 has already been paid, please disregard this notice. However, if you have any
 queries regarding your account, please contact us.
 Thank you in advance.
-'''
+''',
+        'tax_calculation_rounding_method': 'round_per_line',
     }
 
 res_company()
 
=== modified file 'account/company_view.xml'
--- account/company_view.xml	2011-09-29 11:08:56 +0000
+++ account/company_view.xml	2014-04-22 12:10:57 +0000
@@ -25,6 +25,7 @@
                 <field name="currency_id" position="after">
                       <field name="property_reserve_and_surplus_account" colspan="2"/>
                       <field name="paypal_account" />
+                      <field name="tax_calculation_rounding_method" />
                 </field>
             </field>
         </record>
 
=== modified file 'account/data/data_account_type.xml'
--- account/data/data_account_type.xml	2012-01-31 13:36:57 +0000
+++ account/data/data_account_type.xml	2014-04-22 12:10:57 +0000
@@ -22,6 +22,7 @@
           <field name="name">Bank</field>
           <field name="code">bank</field>
           <field name="close_method">balance</field>
+          <field name="report_type">asset</field>
         </record>
         <record model="account.account.type" id="data_account_type_cash">
           <field name="name">Cash</field>
 
=== modified file 'account/partner_view.xml'
--- account/partner_view.xml	2011-09-21 07:13:12 +0000
+++ account/partner_view.xml	2014-04-22 12:10:57 +0000
@@ -96,7 +96,7 @@
                         <separator string="Supplier Debit" colspan="2"/>
                         <field name="debit"/>
                     </group>
-                    <field colspan="4" context="{'address': address}" name="bank_ids" nolabel="1">
+                    <field colspan="4" context="{'address': address, 'default_partner_id': active_id}" name="bank_ids" nolabel="1">
                         <form string="Bank account">
                             <field name="state"/>
                             <newline/>
 
=== modified file 'account/report/account_aged_partner_balance.py'
--- account/report/account_aged_partner_balance.py	2012-09-24 12:41:57 +0000
+++ account/report/account_aged_partner_balance.py	2014-04-22 12:10:57 +0000
@@ -75,7 +75,7 @@
                     AND (account_account.type IN %s)\
                     AND account_account.active\
                     AND ((reconcile_id IS NULL)\
-                       OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                       OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
                     AND (l.partner_id=res_partner.id)\
                     AND (l.date <= %s)\
                     AND ' + self.query + ' \
@@ -99,7 +99,7 @@
                     AND (account_account.type IN %s)\
                     AND (l.partner_id IN %s)\
                     AND ((l.reconcile_id IS NULL)\
-                    OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                    OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
                     AND ' + self.query + '\
                     AND account_account.active\
                     AND (l.date <= %s)\
@@ -119,7 +119,7 @@
                         AND (COALESCE(l.date_maturity, l.date) < %s)\
                         AND (l.partner_id IN %s)\
                         AND ((l.reconcile_id IS NULL)\
-                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
                         AND '+ self.query + '\
                         AND account_account.active\
                     AND (l.date <= %s)\
@@ -136,7 +136,7 @@
                         AND (COALESCE(l.date_maturity,l.date) > %s)\
                         AND (l.partner_id IN %s)\
                         AND ((l.reconcile_id IS NULL)\
-                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
                         AND '+ self.query + '\
                         AND account_account.active\
                     AND (l.date <= %s)\
@@ -168,7 +168,7 @@
                         AND (account_account.type IN %s)
                         AND (l.partner_id IN %s)
                         AND ((l.reconcile_id IS NULL)
-                          OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))
+                          OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))
                         AND ''' + self.query + '''
                         AND account_account.active
                         AND ''' + dates_query + '''
@@ -242,7 +242,7 @@
                     AND (l.partner_id IS NULL)\
                     AND (account_account.type IN %s)\
                     AND ((l.reconcile_id IS NULL) \
-                    OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                    OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
                     AND ' + self.query + '\
                     AND (l.date <= %s)\
                     AND account_account.active ',(tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from,))
@@ -259,7 +259,7 @@
                         AND (account_account.type IN %s)\
                         AND (COALESCE(l.date_maturity, l.date) < %s)\
                         AND ((l.reconcile_id IS NULL)\
-                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
                         AND '+ self.query + '\
                         AND account_account.active ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from))
             t = self.cr.fetchall()
@@ -274,7 +274,7 @@
                         AND (account_account.type IN %s)\
                         AND (COALESCE(l.date_maturity,l.date) > %s)\
                         AND ((l.reconcile_id IS NULL)\
-                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
                         AND '+ self.query + '\
                         AND account_account.active ', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from))
             t = self.cr.fetchall()
@@ -302,7 +302,7 @@
                         AND (account_account.type IN %s)\
                         AND (l.partner_id IS NULL)\
                         AND ((l.reconcile_id IS NULL)\
-                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
+                        OR (l.reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date >= %s::timestamp + \'1day\'::interval )))\
                         AND '+ self.query + '\
                         AND account_account.active\
                         AND ' + dates_query + '\
 
=== modified file 'account/report/account_print_invoice.rml'
--- account/report/account_print_invoice.rml	2011-12-22 15:17:58 +0000
+++ account/report/account_print_invoice.rml	2014-04-22 12:10:57 +0000
@@ -138,21 +138,8 @@
     <images/>
   </stylesheet>
   <story>
-  <pto>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
-    <pto_header><!-- Must be after setLang() -->
-    <blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7">
-    <tr>
-        <td> <para style="terp_tblheader_Details">Description</para> </td>
-        <td> <para style="terp_tblheader_Details_Centre">Taxes</para> </td>
-        <td> <para style="terp_tblheader_Details_Centre">Quantity</para> </td>
-        <td> <para style="terp_tblheader_Details_Right">Unit Price </para> </td>
-        <td> <para style="terp_tblheader_Details_Right">Disc.(%)</para> </td>
-        <td> <para style="terp_tblheader_Details_Right">Price</para> </td>
-    </tr>
-    </blockTable>
-    </pto_header>
     <blockTable colWidths="297.0,233.0" style="Table_Partner_Address">
       <tr>
         <td>
@@ -217,6 +204,19 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+    <pto>
+    <pto_header>
+        <blockTable colWidths="185.0,70.0,80.0,60.0,50.0,85.0" style="Table7">
+        <tr>
+            <td> <para style="terp_tblheader_Details">Description</para> </td>
+            <td> <para style="terp_tblheader_Details_Centre">Taxes</para> </td>
+            <td> <para style="terp_tblheader_Details_Centre">Quantity</para> </td>
+            <td> <para style="terp_tblheader_Details_Right">Unit Price </para> </td>
+            <td> <para style="terp_tblheader_Details_Right">Disc.(%)</para> </td>
+            <td> <para style="terp_tblheader_Details_Right">Price</para> </td>
+        </tr>
+        </blockTable>
+    </pto_header>
     <blockTable colWidths="185.0,70.0,80.0,60.0,50.0,85.0" style="Table7">
       <tr>
         <td>
@@ -294,6 +294,7 @@
         </tr>
       </blockTable>
     </section>
+    </pto>
     <blockTable colWidths="385.0,60.0,85.0" style="Table10">
       <tr>
         <td>
@@ -401,6 +402,5 @@
     <para style="terp_default_2">
       <font color="white"> </font>
     </para>
-  </pto>
   </story>
 </document>
 
=== modified file 'account_analytic_analysis/account_analytic_analysis.py'
--- account_analytic_analysis/account_analytic_analysis.py	2012-01-31 13:36:57 +0000
+++ account_analytic_analysis/account_analytic_analysis.py	2014-04-22 12:10:57 +0000
@@ -419,39 +419,24 @@
 
     def init(self, cr):
         tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_user')
-        cr.execute('CREATE OR REPLACE VIEW account_analytic_analysis_summary_user AS (' \
-                'SELECT ' \
-                    '(u.account_id * u.max_user) + u."user" AS id, ' \
-                    'u.account_id AS account_id, ' \
-                    'u."user" AS "user", ' \
-                    'COALESCE(SUM(l.unit_amount), 0.0) AS unit_amount ' \
-                'FROM ' \
-                    '(SELECT ' \
-                        'a.id AS account_id, ' \
-                        'u1.id AS "user", ' \
-                        'MAX(u2.id) AS max_user ' \
-                    'FROM ' \
-                        'res_users AS u1, ' \
-                        'res_users AS u2, ' \
-                        'account_analytic_account AS a ' \
-                    'GROUP BY u1.id, a.id ' \
-                    ') AS u ' \
-                'LEFT JOIN ' \
-                    '(SELECT ' \
-                        'l.account_id AS account_id, ' \
-                        'l.user_id AS "user", ' \
-                        'SUM(l.unit_amount) AS unit_amount ' \
-                    'FROM account_analytic_line AS l, ' \
-                        'account_analytic_journal AS j ' \
-                    'WHERE (j.type = \'general\') and (j.id=l.journal_id) ' \
-                    'GROUP BY l.account_id, l.user_id ' \
-                    ') AS l '
-                    'ON (' \
-                        'u.account_id = l.account_id ' \
-                        'AND u."user" = l."user"' \
-                    ') ' \
-                'GROUP BY u."user", u.account_id, u.max_user' \
-                ')')
+        cr.execute('''CREATE OR REPLACE VIEW account_analytic_analysis_summary_user AS (
+            with mu as
+                (select max(id) as max_user from res_users)
+            , lu AS
+                (SELECT   
+                 l.account_id AS account_id,   
+                 coalesce(l.user_id, 0) AS user_id,   
+                 SUM(l.unit_amount) AS unit_amount   
+             FROM account_analytic_line AS l,   
+                 account_analytic_journal AS j   
+             WHERE (j.type = 'general' ) and (j.id=l.journal_id)   
+             GROUP BY l.account_id, l.user_id   
+            )
+            select (lu.account_id * mu.max_user) + lu.user_id as id,
+                    lu.account_id as account_id,
+                    lu.user_id as "user",
+                    unit_amount
+            from lu, mu)''')
 
 account_analytic_account_summary_user()
 
 
=== modified file 'account_analytic_plans/account_analytic_plans_view.xml'
--- account_analytic_plans/account_analytic_plans_view.xml	2011-05-31 21:55:34 +0000
+++ account_analytic_plans/account_analytic_plans_view.xml	2014-04-22 12:10:57 +0000
@@ -23,10 +23,10 @@
        <field name="inherit_id" ref="account.view_move_form"/>
        <field name="arch" type="xml">
            <xpath expr="/form/notebook/page/field[@name='line_id']/tree/field[@name='analytic_account_id']" position="replace">
-               <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
+               <field name="analytics_id" context="{'journal_id':parent.journal_id}" groups="analytic.group_analytic_accounting"/>
            </xpath>
            <xpath expr="/form/notebook/page/field[@name='line_id']/form/notebook/page/group/field[@name='analytic_account_id']" position="replace">
-               <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
+               <field name="analytics_id" context="{'journal_id':parent.journal_id}" groups="analytic.group_analytic_accounting"/>
            </xpath>
        </field>
     </record>
 
=== modified file 'account_anglo_saxon/__openerp__.py'
--- account_anglo_saxon/__openerp__.py	2012-01-31 13:36:57 +0000
+++ account_anglo_saxon/__openerp__.py	2014-04-22 12:10:57 +0000
@@ -38,7 +38,7 @@
     "depends": ["product", "purchase"],
     "category": "Hidden/Dependency",
     "init_xml": [],
-    "demo_xml": [],
+    "demo_xml": ['account_anglo_saxon_demo.xml'],
     "update_xml": ["product_view.xml",],
     "auto_install": False,
     "installable": True,
 
=== added file 'account_anglo_saxon/account_anglo_saxon_demo.xml'
--- account_anglo_saxon/account_anglo_saxon_demo.xml	1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/account_anglo_saxon_demo.xml	2014-04-22 12:10:57 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- 
+            Create a stock input account in the minimal
+            chart of accounts
+        -->
+
+        <record id="stk_in" model="account.account">
+            <field name="code">X12000</field>
+            <field name="name">Incoming Stocks - (test)</field>
+            <field ref="account.cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.data_account_type_asset"/>
+        </record>
+
+        <!-- 
+             Set the input account to these products, purchased in
+             the tests in purchase_double_validation
+        -->
+
+        <record id="product.product_product_pc4" model="product.product">
+            <field name="property_stock_account_input"
+                   ref="stk_in" />
+        </record>
+
+        <record id="product.product_product_hdd2" model="product.product">
+            <field name="property_stock_account_input"
+                   ref="stk_in" />
+        </record>
+
+    </data>
+</openerp>
 
=== modified file 'account_anglo_saxon/purchase.py'
--- account_anglo_saxon/purchase.py	2011-12-19 16:54:40 +0000
+++ account_anglo_saxon/purchase.py	2014-04-22 12:10:57 +0000
@@ -26,17 +26,17 @@
     _inherit = "purchase.order"
     _description = "Purchase Order"
 
-    def _prepare_inv_line(self, cr, uid, account_id, order_line, context=None):
-        line = super(purchase_order, self)._prepare_inv_line(cr, uid, account_id, order_line, context=context)
+    def _choose_account_from_po_line(self, cr, uid, order_line, context=None):
+        account_id = super(purchase_order, self)._choose_account_from_po_line(cr, uid, order_line, context=context)
         if order_line.product_id and not order_line.product_id.type == 'service':
             acc_id = order_line.product_id.property_stock_account_input and order_line.product_id.property_stock_account_input.id
             if not acc_id:
                 acc_id = order_line.product_id.categ_id.property_stock_account_input_categ and order_line.product_id.categ_id.property_stock_account_input_categ.id
-            if acc_id:
+            if not acc_id:
+                raise osv.except_osv(_('Error !'), _('There is no stock input account defined for this product or category: "%s" (id:%d)') % (order_line.product_id.name, order_line.product_id.id,))    
+            else:    
                 fpos = order_line.order_id.fiscal_position or False
-                new_account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, acc_id)
-                line.update({'account_id': new_account_id})
-        return line
-purchase_order()
+                account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, acc_id)
+        return account_id
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_asset/account_asset_invoice.py'
--- account_asset/account_asset_invoice.py	2011-11-11 19:29:54 +0000
+++ account_asset/account_asset_invoice.py	2014-04-22 12:10:57 +0000
@@ -57,6 +57,7 @@
                     'partner_id': line.invoice_id.partner_id.id,
                     'company_id': line.invoice_id.company_id.id,
                     'currency_id': line.invoice_id.currency_id.id,
+                    'purchase_date' : line.invoice_id.date_invoice,
                 }
                 changed_vals = asset_obj.onchange_category_id(cr, uid, [], vals['category_id'], context=context)
                 vals.update(changed_vals['value'])
 
=== modified file 'account_budget/account_budget.py'
--- account_budget/account_budget.py	2011-12-31 07:57:20 +0000
+++ account_budget/account_budget.py	2014-04-22 12:10:57 +0000
@@ -113,8 +113,10 @@
         result = 0.0
         if context is None: 
             context = {}
+        account_obj = self.pool.get('account.account')
         for line in self.browse(cr, uid, ids, context=context):
             acc_ids = [x.id for x in line.general_budget_id.account_ids]
+            acc_ids = account_obj._get_children_and_consol(cr, uid, acc_ids, context=context)
             if not acc_ids:
                 raise osv.except_osv(_('Error!'),_("The Budget '%s' has no accounts!") % str(line.general_budget_id.name))
             date_to = line.date_to
@@ -124,7 +126,21 @@
             if context.has_key('wizard_date_to'):
                 date_to = context['wizard_date_to']
             if line.analytic_account_id.id:
-                cr.execute("SELECT SUM(amount) FROM account_analytic_line WHERE account_id=%s AND (date "
+                cr.execute("SELECT SUM(amount) FROM account_analytic_line WHERE account_id in "
+                       """(with recursive account_analytic_account_hierarchy(id)
+                        as 
+                            (
+                                select id from account_analytic_account 
+                                    where id=%s
+                                union all
+                                select account_analytic_account.id from 
+                                    account_analytic_account 
+                                    join account_analytic_account_hierarchy
+                                    on account_analytic_account.parent_id=
+                                        account_analytic_account_hierarchy.id
+                            )"""
+                       "select id from account_analytic_account_hierarchy) "
+                       "AND (date "
                        "between to_date(%s,'yyyy-mm-dd') AND to_date(%s,'yyyy-mm-dd')) AND "
                        "general_account_id=ANY(%s)", (line.analytic_account_id.id, date_from, date_to,acc_ids,))
                 result = cr.fetchone()[0]
 
=== modified file 'account_payment/account_move_line.py'
--- account_payment/account_move_line.py	2011-07-01 23:41:24 +0000
+++ account_payment/account_move_line.py	2014-04-22 12:10:57 +0000
@@ -51,7 +51,7 @@
         if not args:
             return []
         line_obj = self.pool.get('account.move.line')
-        query = line_obj._query_get(cr, uid, context={})
+        query = line_obj._query_get(cr, uid, context=context)
         where = ' and '.join(map(lambda x: '''(SELECT
         CASE WHEN l.amount_currency < 0
             THEN - l.amount_currency
@@ -117,4 +117,4 @@
 
 account_move_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 \ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_payment/account_payment_view.xml'
--- account_payment/account_payment_view.xml	2012-01-31 13:36:57 +0000
+++ account_payment/account_payment_view.xml	2014-04-22 12:10:57 +0000
@@ -107,7 +107,7 @@
                       <field name="user_id"/>
                       <field name="date_prefered"/>
                       <field name="date_scheduled" select="1" attrs="{'readonly':[('date_prefered','!=','fixed')]}" />
-                      <button colspan="2" name="%(action_create_payment_order)d" string="Select Invoices to Pay" type="action" attrs="{'invisible':[('state','=','done')]}" icon="gtk-find"/>
+                      <button colspan="2" name="%(action_create_payment_order)d" string="Select Invoices to Pay" type="action" attrs="{'invisible':[('state','=','done')]}" context="{'all_fiscalyear': True}" icon="gtk-find"/>
                       <field name="company_id" widget='selection' groups="base.group_multi_company"/>
                     </group>
                     <field name="line_ids" colspan="4" widget="one2many_list" nolabel="1" context="{'order_id': active_id or False}" >
 
=== modified file 'analytic/analytic.py'
--- analytic/analytic.py	2012-02-16 18:01:11 +0000
+++ analytic/analytic.py	2014-04-22 12:10:57 +0000
@@ -263,18 +263,15 @@
         if name:
             account = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context)
             if not account:
-                names=map(lambda i : i.strip(),name.split('/'))
-                for i in range(len(names)):
-                    dom=[('name', operator, names[i])]
-                    if i>0:
-                        dom+=[('id','child_of',account)]
-                    account = self.search(cr, uid, dom, limit=limit, context=context)
-                newacc = account
-                while newacc:
-                    newacc = self.search(cr, uid, [('parent_id', 'in', newacc)], limit=limit, context=context)
-                    account += newacc
-                if args:
-                    account = self.search(cr, uid, [('id', 'in', account)] + args, limit=limit, context=context)
+                dom = []
+                for name2 in map(lambda i : i.strip(),name.split('/')):
+                    account = self.search(
+                            cr, uid, 
+                            dom + [('name', 'ilike', name2)] + args,
+                            limit=limit, context=context)
+                    if not account:
+                        break
+                    dom = [('parent_id','in',account)]
         else:
             account = self.search(cr, uid, args, limit=limit, context=context)
         return self.name_get(cr, uid, account, context=context)
 
=== modified file 'audittrail/audittrail.py'
--- audittrail/audittrail.py	2012-03-23 14:25:41 +0000
+++ audittrail/audittrail.py	2014-04-22 12:10:57 +0000
@@ -173,6 +173,10 @@
 class audittrail_objects_proxy(object_proxy):
     """ Uses Object proxy for auditing changes on object of subscribed Rules"""
 
+    _default_recursive_level = 1
+    "Columns to be filtered from audited fields"
+    __filtered_columns = ('__last_update', 'id')
+
     def get_value_text(self, cr, uid, pool, resource_pool, method, field, value):
         """
         Gets textual values for the fields.
@@ -300,7 +304,7 @@
         self.process_data(cr, uid_orig, pool, res_ids, model, method, old_values, new_values, field_list)
         return res
 
-    def get_data(self, cr, uid, pool, res_ids, model, method):
+    def get_data(self, cr, uid, pool, res_ids, model, method, recursive_level=None):
         """
         This function simply read all the fields of the given res_ids, and also recurisvely on
         all records of a x2m fields read that need to be logged. Then it returns the result in
@@ -319,6 +323,8 @@
                                            },
                 }
         """
+        if recursive_level is None:
+            recursive_level = self._default_recursive_level
         data = {}
         resource_pool = pool.get(model.model)
         # read all the fields of the given resources in super admin mode
@@ -328,14 +334,14 @@
             resource_id = resource['id']
             # loop on each field on the res_ids we just have read
             for field in resource:
-                if field in ('__last_update', 'id'):
+                if field in self.__filtered_columns:
                     continue
                 values[field] = resource[field]
                 # get the textual value of that field for this record
                 values_text[field] = self.get_value_text(cr, 1, pool, resource_pool, method, field, resource[field])
 
                 field_obj = resource_pool._all_columns.get(field).column
-                if field_obj._type in ('one2many','many2many'):
+                if field_obj._type in ('one2many','many2many') and recursive_level:
                     # check if an audittrail rule apply in super admin mode
                     if self.check_rules(cr, 1, field_obj._obj, method):
                         # check if the model associated to a *2m field exists, in super admin mode
@@ -344,11 +350,11 @@
                         assert x2m_model_id, _("'%s' Model does not exist..." %(field_obj._obj))
                         x2m_model = pool.get('ir.model').browse(cr, 1, x2m_model_id)
                         #recursive call on x2m fields that need to be checked too
-                        data.update(self.get_data(cr, 1, pool, resource[field], x2m_model, method))
+                        data.update(self.get_data(cr, 1, pool, resource[field], x2m_model, method, recursive_level - 1))
             data[(model.id, resource_id)] = {'text':values_text, 'value': values}
         return data
 
-    def prepare_audittrail_log_line(self, cr, uid, pool, model, resource_id, method, old_values, new_values, field_list=[]):
+    def prepare_audittrail_log_line(self, cr, uid, pool, model, resource_id, method, old_values, new_values, field_list=[], recursive_level=None):
         """
         This function compares the old data (i.e before the method was executed) and the new data 
         (after the method was executed) and returns a structure with all the needed information to
@@ -378,6 +384,8 @@
         record (res.partner, for example), we may have to log a change done in a x2many field (on 
         res.partner.address, for example)
         """
+        if recursive_level is None:
+            recursive_level = self._default_recursive_level
         key = (model.id, resource_id)
         lines = {
             key: []
@@ -385,10 +393,10 @@
         # loop on all the fields
         for field_name, field_definition in pool.get(model.model)._all_columns.items():
             #if the field_list param is given, skip all the fields not in that list
-            if field_list and field_name not in field_list:
+            if field_list and field_name not in field_list or field_name in self.__filtered_columns:
                 continue
             field_obj = field_definition.column
-            if field_obj._type in ('one2many','many2many'):
+            if field_obj._type in ('one2many','many2many') and recursive_level:
                 # checking if an audittrail rule apply in super admin mode
                 if self.check_rules(cr, 1, field_obj._obj, method):
                     # checking if the model associated to a *2m field exists, in super admin mode
@@ -403,7 +411,7 @@
                     # We use list(set(...)) to remove duplicates.
                     res_ids = list(set(x2m_old_values_ids + x2m_new_values_ids))
                     for res_id in res_ids:
-                        lines.update(self.prepare_audittrail_log_line(cr, 1, pool, x2m_model, res_id, method, old_values, new_values, field_list))
+                        lines.update(self.prepare_audittrail_log_line(cr, 1, pool, x2m_model, res_id, method, old_values, new_values, field_list, recursive_level=recursive_level - 1))
             # if the value value is different than the old value: record the change
             if key not in old_values or key not in new_values or old_values[key]['value'][field_name] != new_values[key]['value'][field_name]:
                 data = {
 
=== modified file 'base_action_rule/base_action_rule.py'
--- base_action_rule/base_action_rule.py	2012-04-26 08:03:00 +0000
+++ base_action_rule/base_action_rule.py	2014-04-22 12:10:57 +0000
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv, orm
+from openerp import SUPERUSER_ID
 from tools.translate import _
 from datetime import datetime
 from datetime import timedelta
@@ -202,11 +203,13 @@
             return True
         return wrapper
 
-    def _register_hook(self, cr, uid, ids, context=None):
+    def _register_hook(self, cr, uid=SUPERUSER_ID, ids=None, context=None):
         """
         Wrap every `create` and `write` methods of the models specified by
         the rules (given by `ids`).
         """
+        if ids == [] or ids is None:
+            ids = self.search(cr, uid, [])
         for action_rule in self.browse(cr, uid, ids, context=context):
             model = action_rule.model_id.model
             obj_pool = self.pool.get(model)
 
=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py	2012-03-05 14:35:54 +0000
+++ base_calendar/base_calendar.py	2014-04-22 12:10:57 +0000
@@ -30,6 +30,7 @@
 import re
 import time
 import tools
+from operator import itemgetter
 
 months = {
     1: "January", 2: "February", 3: "March", 4: "April", \
@@ -85,7 +86,10 @@
                 return (int(real_id), real_date, end.strftime("%Y-%m-%d %H:%M:%S"))
             return int(real_id)
 
-    return base_calendar_id and int(base_calendar_id) or base_calendar_id
+        return int(base_calendar_id)
+
+    return base_calendar_id
+    
 
 def real_id2base_calendar_id(real_id, recurrent_date):
     """
@@ -1303,6 +1307,18 @@
                 res.append(base_calendar_id2real_id(id))
             return res
 
+    def _multikeysort(self, items, columns):
+
+        comparers = [ ((itemgetter(col[1:].strip()), -1) if col.startswith('-') else (itemgetter(col.strip()), 1)) for col in columns]
+        def comparer(left, right):
+            for fn, mult in comparers:
+                result = cmp(fn(left), fn(right))
+                if result:
+                    return mult * result
+                else:
+                    return 0
+        return sorted(items, cmp=comparer)
+
     def search(self, cr, uid, args, offset=0, limit=0, order=None, context=None, count=False):
         context = context or {}
         args_without_date = []
@@ -1327,6 +1343,16 @@
                                  0, 0, order, context, count=False)
         if context.get('virtual_id', True):
             res = self.get_recurrent_ids(cr, uid, res, args, limit, context=context)
+            if order:
+                order = order.split(',')
+                sortby = {}
+                for o in order:
+                    spl = o.split()
+                    sortby[spl[0]] = spl[1]
+                fields = sortby.keys()
+                ordered = self.read(cr, uid, res, fields=fields, context=context)
+                res = self._multikeysort(ordered, [key.split()[0] if sortby[key.split()[0]] == 'ASC' else '-%s' % key.split()[0] for key in order])
+                res = [x['id'] for x in res]
 
         if count:
             return len(res)
 
=== modified file 'base_contact/base_contact.py'
--- base_contact/base_contact.py	2012-02-15 13:22:13 +0000
+++ base_contact/base_contact.py	2014-04-22 12:10:57 +0000
@@ -93,7 +93,7 @@
             return bool(value == 1)
 
         exists = table_exists(self._table)
-        super(res_partner_contact, self)._auto_init(cr, context)
+        result = super(res_partner_contact, self)._auto_init(cr, context)
 
         if not exists:
             cr.execute("""
@@ -108,6 +108,8 @@
             cr.execute("update res_partner_address set contact_id=id")
             cr.execute("select setval('res_partner_contact_id_seq', (select max(id)+1 from res_partner_contact))")
 
+        return result
+
 res_partner_contact()
 
 class res_partner_location(osv.osv):
 
=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml	2012-11-20 11:39:58 +0000
+++ crm/crm_lead_view.xml	2014-04-22 12:10:57 +0000
@@ -483,6 +483,8 @@
                         <field name="partner_address_id"
                             string="Contact"
                             on_change="onchange_partner_address_id(partner_address_id, email_from)"
+                            options='{"quick_create": false}' 
+                            context="{'default_partner_id':partner_id}"
                             colspan="1" />
                         <group col="3" colspan="2">
                             <field name="email_from" string="Email" />
 
=== modified file 'crm/crm_meeting_view.xml'
--- crm/crm_meeting_view.xml	2012-01-31 13:36:57 +0000
+++ crm/crm_meeting_view.xml	2014-04-22 12:10:57 +0000
@@ -62,7 +62,9 @@
                                 on_change="onchange_partner_id(partner_id)" />
                             <field name="partner_address_id"
                                 string="Contact"
-                                on_change="onchange_partner_address_id(partner_address_id, email_from)" />
+                                on_change="onchange_partner_address_id(partner_address_id, email_from)"
+                                options='{"quick_create": false}' 
+                                context="{'default_partner_id':partner_id}" />
                             <field name="email_from"/>
                         </group><group col="2" colspan="2">
                             <separator colspan="2" string="Visibility"/>
 
=== modified file 'crm/crm_phonecall_view.xml'
--- crm/crm_phonecall_view.xml	2011-12-21 13:10:28 +0000
+++ crm/crm_phonecall_view.xml	2014-04-22 12:10:57 +0000
@@ -92,7 +92,9 @@
                         groups="base.group_partner_manager"/>
                     <newline/>
                     <field name="partner_address_id"
-                        on_change="onchange_partner_address_id(partner_address_id)" />
+                        on_change="onchange_partner_address_id(partner_address_id)"
+                        options='{"quick_create": false}' 
+                        context="{'default_partner_id':partner_id}" />
                     <newline/>
                     <field name="partner_mobile" />
                 </group>
 
=== modified file 'crm_claim/crm_claim_view.xml'
--- crm_claim/crm_claim_view.xml	2012-01-31 13:36:57 +0000
+++ crm_claim/crm_claim_view.xml	2014-04-22 12:10:57 +0000
@@ -91,7 +91,9 @@
                                     <field name="partner_id" string="Partner"
                                         on_change="onchange_partner_id(partner_id)" />
                                     <field name="partner_address_id" string="Contact"
-                                        on_change="onchange_partner_address_id(partner_address_id, email_from)" />
+                                        on_change="onchange_partner_address_id(partner_address_id, email_from)" 
+                                        options='{"quick_create": false}' 
+                                        context="{'default_partner_id':partner_id}" />
                                     <field name="partner_phone"/>
                                     <field name="email_from" widget="email"/>
                                 </group>
 
=== modified file 'crm_fundraising/crm_fundraising_view.xml'
--- crm_fundraising/crm_fundraising_view.xml	2011-12-19 16:54:40 +0000
+++ crm_fundraising/crm_fundraising_view.xml	2014-04-22 12:10:57 +0000
@@ -97,6 +97,8 @@
                                 <field name="partner_address_id"
                                     string="Contact"
                                     on_change="onchange_partner_address_id(partner_address_id, email_from)"
+                                    options='{"quick_create": false}' 
+                                    context="{'default_partner_id':partner_id}" 
                                     colspan="1" />
                                 <field name="email_from" colspan="2"/>
                             </group>
 
=== modified file 'crm_helpdesk/crm_helpdesk_view.xml'
--- crm_helpdesk/crm_helpdesk_view.xml	2011-12-19 16:54:40 +0000
+++ crm_helpdesk/crm_helpdesk_view.xml	2014-04-22 12:10:57 +0000
@@ -49,7 +49,8 @@
                                     select="1" />
                                 <field name="partner_address_id" colspan="2"
                                     on_change="onchange_partner_address_id(partner_address_id, email_from)"
-                                />
+                                    options='{"quick_create": false}' 
+                                    context="{'default_partner_id':partner_id}" />
                                 <newline/>
                                 <field name="email_from" colspan="2"/>
                                 <button name="remind_partner"
 
=== modified file 'delivery/__openerp__.py'
--- delivery/__openerp__.py	2012-01-31 13:36:57 +0000
+++ delivery/__openerp__.py	2014-04-22 12:10:57 +0000
@@ -46,6 +46,7 @@
     'demo_xml': ['delivery_demo.xml'],
     'test': [
         'test/delivery_cost.yml',
+        'test/delivery_chained_pickings.yml',
     ],
     'installable': True,
     'auto_install': False,
 
=== modified file 'delivery/stock.py'
--- delivery/stock.py	2011-12-21 18:11:49 +0000
+++ delivery/stock.py	2014-04-22 12:10:57 +0000
@@ -75,7 +75,7 @@
             :param browse_record picking: the stock picking being invoiced
             :param browse_record invoice: the stock picking's invoice
             :return: dict containing the values to create the invoice line,
-                     or None to create nothing
+            or None to create nothing
         """
         carrier_obj = self.pool.get('delivery.carrier')
         grid_obj = self.pool.get('delivery.grid')
@@ -160,6 +160,17 @@
                             }
         return res
 
+    def _prepare_chained_picking(self, cr, uid, picking_name, picking, picking_type, moves_todo, context=None):
+        values = super(stock_move, self)._prepare_chained_picking(cr, uid, picking_name, picking, picking_type, moves_todo, context=context)
+        if picking.carrier_id:
+            values['carrier_id'] = picking.carrier_id.id
+        values['volume'] = picking.volume
+        values['weight'] = picking.weight
+        values['weight_net'] = picking.weight_net
+        values['carrier_tracking_ref'] = picking.carrier_tracking_ref
+        values['number_of_packages'] = picking.number_of_packages
+        return values
+
     _columns = {
         'weight': fields.function(_cal_move_weight, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_move_weight',
                   store={
 
=== added file 'delivery/test/delivery_chained_pickings.yml'
--- delivery/test/delivery_chained_pickings.yml	1970-01-01 00:00:00 +0000
+++ delivery/test/delivery_chained_pickings.yml	2014-04-22 12:10:57 +0000
@@ -0,0 +1,37 @@
+-
+ I create a picking to stock.location_convenience_shop, which is chained with stock.location_refrigerator
+-
+  !record {model: stock.picking, id: shipment_with_delivery}:
+    type: internal
+    carrier_id: delivery.delivery_carrier
+    volume: 42
+    carrier_tracking_ref: FDX123
+    number_of_packages: 7
+-
+  I add a move in the picking
+-
+  !record {model: stock.move, id: icecream_move}:
+    picking_id: shipment_with_delivery
+    product_id: stock.product_icecream
+    product_uom: product.product_uom_kgm
+    product_qty: 130.0
+    location_id: stock.stock_location_suppliers
+    location_dest_id: stock.location_convenience_shop
+-
+ I confirm the picking
+-
+   !workflow {model: stock.picking, action: button_confirm, ref: shipment_with_delivery}
+-
+ I check that the delivery fields have been propagated to the chained picking
+-
+  !python {model: stock.move}: |
+     original_move = self.browse(cr, uid, ref('icecream_move'), context=context)
+     original_picking = original_move.picking_id
+     chained_move = original_move.move_dest_id
+     chained_picking = chained_move.picking_id
+     assert chained_picking.carrier_tracking_ref == original_picking.carrier_tracking_ref, 'no propagation of carrier_tracking_ref'
+     assert chained_picking.carrier_id == original_picking.carrier_id, 'no propagation of carrier_id'
+     assert chained_picking.volume == original_picking.volume, 'no propagation of volume'
+     assert chained_picking.weight == original_picking.weight, 'no propagation of weight'
+     assert chained_picking.weight_net == original_picking.weight_net, 'no propagation of weight'
+
 
=== modified file 'document/document.py'
--- document/document.py	2012-08-22 09:10:40 +0000
+++ document/document.py	2014-04-22 12:10:57 +0000
@@ -147,6 +147,9 @@
         # filename_uniq is not possible in pure SQL
     ]
     def _check_duplication(self, cr, uid, vals, ids=[], op='create'):
+        """
+        Returns True if not same filename is attached already to an object (res_model, res_id) 
+        """    
         name = vals.get('name', False)
         parent_id = vals.get('parent_id', False)
         res_model = vals.get('res_model', False)
@@ -340,14 +343,21 @@
                     storage_id = par.storage_id
                     break
                 par = par.parent_id
-            #assert storage_id, "Strange, found file #%s w/o storage!" % f.id #TOCHECK: after run yml, it's fail
-            if storage_id:
-                r = stor.prepare_unlink(cr, uid, storage_id, f)
-                if r:
-                    unres.append(r)
-            else:
-                logging.getLogger('document').warning("Unlinking attachment #%s %s that has no storage",
-                                                f.id, f.name)
+            #We get the ids of attachement that correspond to the document
+            attachment_ids = self.search(cr, uid, [('store_fname', '=', f.store_fname), ('parent_id.name', '=', f.parent_id.name)], context=context)
+            #If we have more than 1 attachment for a same file, we will not unlink it.
+            canUnlink = len(attachment_ids)
+            #If canUnlink is bigger than 1 it means that the document has more than 1 attachement.
+            #We therefore cannot unlink that document.
+            if canUnlink == 1:
+                #assert storage_id, "Strange, found file #%s w/o storage!" % f.id #TOCHECK: after run yml, it's fail            
+                if storage_id:
+                    r = stor.prepare_unlink(cr, uid, storage_id, f)
+                    if r:
+                        unres.append(r)
+                else:
+                    logging.getLogger('document').warning("Unlinking attachment #%s %s that has no storage",
+                                                    f.id, f.name)
         res = super(document_file, self).unlink(cr, uid, ids, context)
         stor.do_unlink(cr, uid, unres)
         return res
 
=== modified file 'fetchmail/fetchmail.py'
--- fetchmail/fetchmail.py	2012-07-27 13:50:07 +0000
+++ fetchmail/fetchmail.py	2014-04-22 12:10:57 +0000
@@ -255,7 +255,7 @@
             context={}
         fetchmail_server_id = context.get('fetchmail_server_id')
         if fetchmail_server_id:
-            values['fetchmail_server_id'] = server_id
+            values['fetchmail_server_id'] = fetchmail_server_id
         res = super(mail_message,self).write(cr, uid, ids, values, context=context)
         return res
 
 
=== modified file 'hr/hr.py'
--- hr/hr.py	2012-01-31 13:36:57 +0000
+++ hr/hr.py	2014-04-22 12:10:57 +0000
@@ -184,9 +184,10 @@
             resource = employee.resource_id
             if resource:
                 resource_ids.append(resource.id)
+        res = super(hr_employee, self).unlink(cr, uid, ids, context=context)
         if resource_ids:
             resource_obj.unlink(cr, uid, resource_ids, context=context)
-        return super(hr_employee, self).unlink(cr, uid, ids, context=context)
+        return res
 
     def onchange_address_id(self, cr, uid, ids, address, context=None):
         if address:
 
=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py	2012-01-31 13:36:57 +0000
+++ hr_payroll/hr_payroll.py	2014-04-22 12:10:57 +0000
@@ -375,7 +375,7 @@
         #OR if it starts between the given dates
         clause_2 = ['&',('date_start', '<=', date_to),('date_start','>=', date_from)]
         #OR if it starts before the date_from and finish after the date_end (or never finish)
-        clause_3 = [('date_start','<=', date_from),'|',('date_end', '=', False),('date_end','>=', date_to)]
+        clause_3 = ['&',('date_start','<=', date_from),'|',('date_end', '=', False),('date_end','>=', date_to)]
         clause_final =  [('employee_id', '=', employee.id),'|','|'] + clause_1 + clause_2 + clause_3
         contract_ids = contract_obj.search(cr, uid, clause_final, context=context)
         return contract_ids
 
=== modified file 'hr_recruitment/hr_recruitment_view.xml'
--- hr_recruitment/hr_recruitment_view.xml	2011-12-21 13:10:28 +0000
+++ hr_recruitment/hr_recruitment_view.xml	2014-04-22 12:10:57 +0000
@@ -104,7 +104,7 @@
                                     name="%(action_hr_recruitment_partner_create)d"
                                     icon="gtk-index" type="action" attrs="{'readonly':[('partner_id','!=',False)]}" groups="base.group_partner_manager"/>
                             <newline/>
-                            <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="3"/>
+                            <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" options='{"quick_create": false}' context="{'default_partner_id':partner_id}" colspan="3"/>
                             <field name="email_from" colspan="3"/>
                             <field name="partner_phone" colspan="3"/>
                             <field name="partner_mobile" colspan="3"/>
 
=== modified file 'hr_timesheet/hr_timesheet.py'
--- hr_timesheet/hr_timesheet.py	2012-02-14 12:25:20 +0000
+++ hr_timesheet/hr_timesheet.py	2014-04-22 12:10:57 +0000
@@ -74,8 +74,7 @@
         toremove = {}
         for obj in self.browse(cr, uid, ids, context=context):
             toremove[obj.line_id.id] = True
-        self.pool.get('account.analytic.line').unlink(cr, uid, toremove.keys(), context=context)
-        return super(hr_analytic_timesheet, self).unlink(cr, uid, ids, context=context)
+        return self.pool.get('account.analytic.line').unlink(cr, uid, toremove.keys(), context=context)
 
 
     def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount, company_id, unit=False, journal_id=False, context=None):
 
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice.py'
--- hr_timesheet_invoice/hr_timesheet_invoice.py	2012-01-03 12:33:39 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice.py	2014-04-22 12:10:57 +0000
@@ -193,10 +193,13 @@
         res = super(account_move_line, self).create_analytic_lines(cr, uid, ids,context=context)
         analytic_line_obj = self.pool.get('account.analytic.line')
         for move_line in self.browse(cr, uid, ids, context=context):
+            #For customer invoice, link analytic line to the invoice so it is not proposed for invoicing in Bill Tasks Work
+            invoice_id = move_line.invoice and move_line.invoice.type in ('out_invoice','out_refund') and move_line.invoice.id or False
             for line in move_line.analytic_lines:
-                toinv = line.account_id.to_invoice.id
-                if toinv:
-                    analytic_line_obj.write(cr, uid, line.id, {'to_invoice': toinv})
+                analytic_line_obj.write(cr, uid, line.id, {
+                    'invoice_id': invoice_id,
+                    'to_invoice': line.account_id.to_invoice and line.account_id.to_invoice.id or False
+                    }, context=context)
         return res
 
 account_move_line()
 
=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
--- hr_timesheet_sheet/hr_timesheet_sheet.py	2012-08-31 10:45:03 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet.py	2014-04-22 12:10:57 +0000
@@ -519,7 +519,7 @@
             store={
                     'hr_timesheet_sheet.sheet': (_get_hr_timesheet_sheet, ['employee_id', 'date_from', 'date_to'], 10),
                     'account.analytic.line': (_get_account_analytic_line, ['user_id', 'date'], 10),
-                    'hr.analytic.timesheet': (lambda self,cr,uid,ids,context=None: ids, ['line_id'], 10),
+                    'hr.analytic.timesheet': (lambda self,cr,uid,ids,context=None: ids, None, 10),
                   },
             ),
     }
 
=== modified file 'l10n_nl/__openerp__.py'
--- l10n_nl/__openerp__.py	2011-12-19 16:54:40 +0000
+++ l10n_nl/__openerp__.py	2014-04-22 12:10:57 +0000
@@ -118,6 +118,9 @@
                  ],
     "init_xml" : [],
     "update_xml" : ["account_chart_netherlands.xml",
+                    "account_fiscal_position_template.xml",
+                    "account_fiscal_position_tax_template.xml",
+                    "account_fiscal_position_account_template.xml",
                     "l10n_nl_wizard.xml"
                    ],
     "demo_xml" : [
 
=== modified file 'l10n_nl/account_chart_netherlands.xml'
--- l10n_nl/account_chart_netherlands.xml	2012-03-14 12:53:24 +0000
+++ l10n_nl/account_chart_netherlands.xml	2014-04-22 12:10:57 +0000
@@ -1424,7 +1424,7 @@
 					<field name="reconcile" eval="True"/>
 					<field ref="a_15" name="parent_id"/>
 				</record>
-				<record id="vat_payable6" model="account.account.template">
+				<record id="vat_payable_low" model="account.account.template">
 					<field name="name">Btw af te dragen laag</field>
 					<field name="code">1601</field>
 					<field name="type">other</field>
@@ -1432,7 +1432,7 @@
 					<field name="reconcile" eval="False"/>
 					<field ref="a_15" name="parent_id"/>
 				</record>
-				<record id="vat_payable19" model="account.account.template">
+				<record id="vat_payable_high" model="account.account.template">
 					<field name="name">Btw af te dragen hoog</field>
 					<field name="code">1602</field>
 					<field name="type">other</field>
@@ -1448,7 +1448,7 @@
 					<field name="reconcile" eval="False"/>
 					<field ref="a_15" name="parent_id"/>
 				</record>
-				<record id="vat_refund6" model="account.account.template">
+				<record id="vat_refund_low" model="account.account.template">
 					<field name="name">Btw te vorderen laag</field>
 					<field name="code">1611</field>
 					<field name="type">other</field>
@@ -1456,7 +1456,7 @@
 					<field name="reconcile" eval="False"/>
 					<field ref="a_15" name="parent_id"/>
 				</record>
-				<record id="vat_refund19" model="account.account.template">
+				<record id="vat_refund_high" model="account.account.template">
 					<field name="name">Btw te vorderen hoog</field>
 					<field name="code">1612</field>
 					<field name="type">other</field>
@@ -3909,7 +3909,7 @@
         <record id="btw_code_1a" model="account.tax.code.template">
             <field name="code">1a</field>
             <field name="parent_id" ref="btw_code_binnenland"/>
-            <field name="name">Leveringen/diensten belast met 19% (BTW)</field>
+            <field name="name">Leveringen/diensten belast met 21% (BTW)</field>
         </record>
         <record id="btw_code_1b" model="account.tax.code.template">
             <field name="code">1b</field>
@@ -3955,11 +3955,13 @@
             <field name="code">4a</field>
             <field name="parent_id" ref="btw_code_vanuit_buitenland"/>
             <field name="name">Leveringen uit landen buiten de EU (invoer) (BTW)</field>
+            <field name="sign" eval="-1" />
         </record>
         <record id="btw_code_4b" model="account.tax.code.template">
             <field name="code">4b</field>
             <field name="parent_id" ref="btw_code_vanuit_buitenland"/>
             <field name="name">Verwerving van goederen uit landen binnen de EU (BTW)</field>
+            <field name="sign" eval="-1" />
         </record>
 <!-- 5. Voorbelasting, kleineondernemersregeling, schatting en eindtotaal -->
         <record id="btw_code_voorbelasting" model="account.tax.code.template">
@@ -4019,7 +4021,7 @@
         <record id="omz_code_1a" model="account.tax.code.template">
             <field name="code">1a</field>
             <field name="parent_id" ref="omz_code_binnenland"/>
-            <field name="name">Leveringen/diensten belast met 19% (omzet)</field>
+            <field name="name">Leveringen/diensten belast met 21% (omzet)</field>
         </record>
         <record id="omz_code_1b" model="account.tax.code.template">
             <field name="code">1b</field>
@@ -4100,6 +4102,7 @@
             <field name="property_account_payable" ref="a_pay"/>          <!-- crediteuren -->
             <field name="property_account_expense_categ" ref="a_expense"/><!-- aankoop grondstoffen -->
             <field name="property_account_income_categ" ref="a_sale"/>    <!-- verkoop rekening -->
+            <field name="property_reserve_and_surplus_account" ref="a_9999"/>
         </record>
 
 <!-- BTW  Template
@@ -4130,436 +4133,541 @@
 <!-- Binnen Nederland -->
 <!-- Verkoop BTW -->
         <record id="btw_0" model="account.tax.template">
+            <field name="sequence">10</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Verkopen/omzet onbelast (nul-tarief)</field>
             <field name="description">0% BTW</field>
             <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_payable0"/>
-            <field name="account_paid_id" ref="vat_refund0"/>
+            <field name="account_paid_id" ref="vat_payable0"/>
             <field name="base_code_id" ref="omz_code_1e"/>
             <field name="ref_base_code_id" ref="omz_code_1e"/>
+            <field name="ref_base_sign" eval="-1"/>
+            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">sale</field>
         </record>
         <record id="btw_6" model="account.tax.template">
+            <field name="sequence">10</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Verkopen/omzet laag</field>
             <field name="description">6% BTW</field>
             <field eval="0.06" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="vat_payable6"/>
-            <field name="account_paid_id" ref="vat_refund6"/>
+            <field name="account_collected_id" ref="vat_payable_low"/>
+            <field name="account_paid_id" ref="vat_payable_low"/>
             <field name="base_code_id" ref="omz_code_1b"/>
             <field name="tax_code_id" ref="btw_code_1b"/>
             <field name="ref_base_code_id" ref="omz_code_1b"/>
             <field name="ref_tax_code_id" ref="btw_code_1b"/>
+            <field name="ref_base_sign" eval="-1"/>
+            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">sale</field>
         </record>
-        <record id="btw_19" model="account.tax.template">
+        <record id="btw_21" model="account.tax.template">
+            <field name="sequence">5</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Verkopen/omzet hoog</field>
-            <field name="description">19% BTW</field>
-            <field eval="0.19" name="amount"/>
+            <field name="description">21% BTW</field>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="vat_payable19"/>
-            <field name="account_paid_id" ref="vat_refund19"/>
+            <field name="account_collected_id" ref="vat_payable_high"/>
+            <field name="account_paid_id" ref="vat_payable_high"/>
             <field name="base_code_id" ref="omz_code_1a"/>
             <field name="tax_code_id" ref="btw_code_1a"/>
             <field name="ref_base_code_id" ref="omz_code_1a"/>
             <field name="ref_tax_code_id" ref="btw_code_1a"/>
+            <field name="ref_base_sign" eval="-1"/>
+            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">sale</field>
         </record>
 <!-- TODO - nakijken btw overig op percentage-->
         <record id="btw_overig" model="account.tax.template">
+            <field name="sequence">15</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Verkopen/omzet overig</field>
             <field name="description">variabel BTW</field>
-            <field eval="0.19" name="amount"/>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="vat_payable19"/>
-            <field name="account_paid_id" ref="vat_refund19"/>
+            <field name="account_collected_id" ref="vat_payable_high"/>
+            <field name="account_paid_id" ref="vat_payable_high"/>
             <field name="base_code_id" ref="omz_code_1a"/>
             <field name="tax_code_id" ref="btw_code_1a"/>
             <field name="ref_base_code_id" ref="omz_code_1c"/>
             <field name="ref_tax_code_id" ref="btw_code_1c"/>
+            <field name="ref_base_sign" eval="-1"/>
+            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">sale</field>
         </record>
 
 <!--Inkoop BTW -->
         <record id="btw_6_buy" model="account.tax.template">
+            <field name="sequence">10</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">BTW te vorderen laag (inkopen)</field>
             <field name="description">6% BTW</field>
             <field eval="0.06" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="vat_refund6"/>
-            <field name="account_paid_id" ref="vat_payable6"/>
+            <field name="account_collected_id" ref="vat_refund_low"/>
+            <field name="account_paid_id" ref="vat_refund_low"/>
             <field name="tax_code_id" ref="btw_code_5b"/>
             <field name="ref_tax_code_id" ref="btw_code_5b"/>
+            <field name="ref_base_sign" eval="-1"/>
+            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        <record id="btw_19_buy" model="account.tax.template">
+        <record id="btw_21_buy" model="account.tax.template">
+            <field name="sequence">5</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">BTW te vorderen hoog (inkopen)</field>
-            <field name="description">19% BTW</field>
-            <field eval="0.19" name="amount"/>
+            <field name="description">21% BTW</field>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="vat_refund19"/>
-            <field name="account_paid_id" ref="vat_payable19"/>
+            <field name="account_collected_id" ref="vat_refund_high"/>
+            <field name="account_paid_id" ref="vat_refund_high"/>
             <field name="tax_code_id" ref="btw_code_5b"/>
             <field name="ref_tax_code_id" ref="btw_code_5b"/>
+            <field name="ref_base_sign" eval="-1"/>
+            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">purchase</field>
         </record>
         <record id="btw_overig_buy" model="account.tax.template">
+            <field name="sequence">15</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">BTW te vorderen overig (inkopen)</field>
             <field name="description">variabel BTW</field>
-            <field eval="0.19" name="amount"/>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="vat_refund19"/>
-            <field name="account_paid_id" ref="vat_payable19"/>
+            <field name="account_collected_id" ref="vat_refund_high"/>
+            <field name="account_paid_id" ref="vat_refund_high"/>
             <field name="tax_code_id" ref="btw_code_5b"/>
             <field name="ref_tax_code_id" ref="btw_code_5b"/>
+            <field name="ref_base_sign" eval="-1"/>
+            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">purchase</field>
         </record>
 <!--BTW verlegd-->
-	<record id="btw_verk_0" model="account.tax.template">
+    <record id="btw_verk_0" model="account.tax.template">
+           <field name="sequence">15</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">BTW af te dragen verlegd (verkopen)</field>
             <field name="description">0% BTW verlegd</field>
             <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_payable_verlegd"/>
-            <field name="account_paid_id" ref="vat_refund_verlegd"/>
+            <field name="account_paid_id" ref="vat_payable_verlegd"/>
             <field eval="omz_code_1e" name="base_code_id"/>
             <field eval="omz_code_1e" name="ref_base_code_id"/>
+            <field name="ref_base_sign" eval="-1"/>
+            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">purchase</field>
         </record>
         <record id="btw_ink_0" model="account.tax.template">
+            <field name="sequence">15</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">BTW af te dragen verlegd (inkopen)</field>
-            <field name="description">19% BTW verlegd</field>
-            <field eval="0.19" name="amount"/>
+            <field name="description">21% BTW verlegd</field>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_payable_verlegd"/>
-            <field name="account_paid_id" ref="vat_refund_verlegd"/>
+            <field name="account_paid_id" ref="vat_payable_verlegd"/>
             <field eval="omz_code_2a" name="base_code_id"/>
             <field eval="omz_code_2a" name="ref_base_code_id"/>
+            <field name="ref_base_sign" eval="-1"/>
+            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">purchase</field>
             <field eval="True" name="child_depend"/>
         </record>
-				        <record id="btw_ink_0_1" model="account.tax.template">
-				            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-				            <field name="name">BTW af te dragen verlegd (inkopen1)</field>
-				            <field eval="1.00" name="amount"/>
-				            <field name="type">percent</field>
-				            <field eval="btw_ink_0" name="parent_id"/>
-				            <field name="account_collected_id" ref="vat_payable_verlegd"/>
-				            <field name="account_paid_id" ref="vat_refund_verlegd"/>
-				            <field eval="btw_code_2a" name="tax_code_id"/>
-				            <field eval="btw_code_2a" name="ref_tax_code_id"/>
-				            <field name="type_tax_use">purchase</field>
-				        </record>
-				        <record id="btw_ink_0_2" model="account.tax.template">
-				            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-				            <field name="name">BTW af te dragen verlegd (inkopen2)</field>
-				            <field eval="-1.00" name="amount"/>
-				            <field name="type">percent</field>
-				            <field eval="btw_ink_0" name="parent_id"/>
-				            <field name="account_collected_id" ref="vat_payable_verlegd"/>
-				            <field name="account_paid_id" ref="vat_refund_verlegd"/>
-				            <field eval="btw_code_5b" name="tax_code_id"/>
-				            <field eval="btw_code_5b" name="ref_tax_code_id"/>
-				            <field name="type_tax_use">purchase</field>
-				        </record>
+                        <record id="btw_ink_0_1" model="account.tax.template">
+                            <field name="sequence">99</field>
+                            <field name="chart_template_id" ref="l10nnl_chart_template"/>
+                            <field name="name">BTW af te dragen verlegd (inkopen1)</field>
+                            <field eval="1.00" name="amount"/>
+                            <field name="type">percent</field>
+                            <field eval="btw_ink_0" name="parent_id"/>
+                            <field name="account_collected_id" ref="vat_payable_verlegd"/>
+                            <field name="account_paid_id" ref="vat_payable_verlegd"/>
+                            <field eval="btw_code_2a" name="tax_code_id"/>
+                            <field eval="btw_code_2a" name="ref_tax_code_id"/>
+                            <field name="ref_base_sign" eval="-1"/>
+                            <field name="ref_tax_sign" eval="-1"/>
+                            <field name="type_tax_use">purchase</field>
+                        </record>
+                        <record id="btw_ink_0_2" model="account.tax.template">
+                            <field name="sequence">99</field>
+                            <field name="chart_template_id" ref="l10nnl_chart_template"/>
+                            <field name="name">BTW af te dragen verlegd (inkopen2)</field>
+                            <field eval="-1.00" name="amount"/>
+                            <field name="type">percent</field>
+                            <field eval="btw_ink_0" name="parent_id"/>
+                            <field name="account_collected_id" ref="vat_payable_verlegd"/>
+                            <field name="account_paid_id" ref="vat_payable_verlegd"/>
+                            <field eval="btw_code_5b" name="tax_code_id"/>
+                            <field eval="btw_code_5b" name="ref_tax_code_id"/>
+                            <field name="ref_base_sign" eval="-1"/>
+                            <field name="ref_tax_sign" eval="-1"/>
+                            <field name="type_tax_use">purchase</field>
+                        </record>
         <record id="btw_ink2_0" model="account.tax.template">
+            <field name="sequence">15</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">BTW te vorderen verlegd (inkopen)</field>
-            <field name="description">19% BTW verlegd</field>
-            <field eval="0.19" name="amount"/>
+            <field name="description">21% BTW verlegd</field>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_refund_verlegd"/>
-            <field name="account_paid_id" ref="vat_payable_verlegd"/>
+            <field name="account_paid_id" ref="vat_refund_verlegd"/>
             <field eval="omz_code_2a" name="base_code_id"/>
             <field eval="omz_code_2a" name="ref_base_code_id"/>
+            <field name="ref_base_sign" eval="-1"/>
+            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">purchase</field>
             <field eval="True" name="child_depend"/>
         </record>
-				        <record id="btw_ink2_0_1" model="account.tax.template">
-				            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-				            <field name="name">BTW te vorderen verlegd (inkopen1)</field>
-				            <field eval="1.00" name="amount"/>
-				            <field name="type">percent</field>
-				            <field eval="btw_ink2_0" name="parent_id"/>
-				            <field name="account_collected_id" ref="vat_refund_verlegd"/>
-				            <field name="account_paid_id" ref="vat_payable_verlegd"/>
-				            <field eval="btw_code_2a" name="tax_code_id"/>
-				            <field eval="btw_code_2a" name="ref_tax_code_id"/>
-				            <field name="type_tax_use">purchase</field>
-				        </record>
-				        <record id="btw_ink2_0_2" model="account.tax.template">
-				            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-				            <field name="name">BTW te vorderen verlegd (inkopen2)</field>
-				            <field eval="-1.00" name="amount"/>
-				            <field name="type">percent</field>
-				            <field eval="btw_ink2_0" name="parent_id"/>
-				            <field name="account_collected_id" ref="vat_refund_verlegd"/>
-				            <field name="account_paid_id" ref="vat_payable_verlegd"/>
-				            <field eval="btw_code_5b" name="tax_code_id"/>
-				            <field eval="btw_code_5b" name="ref_tax_code_id"/>
-				            <field name="type_tax_use">purchase</field>
-				        </record>
+                        <record id="btw_ink2_0_1" model="account.tax.template">
+                            <field name="sequence">99</field>
+                            <field name="chart_template_id" ref="l10nnl_chart_template"/>
+                            <field name="name">BTW te vorderen verlegd (inkopen1)</field>
+                            <field eval="1.00" name="amount"/>
+                            <field name="type">percent</field>
+                            <field eval="btw_ink2_0" name="parent_id"/>
+                            <field name="account_collected_id" ref="vat_refund_verlegd"/>
+                            <field name="account_paid_id" ref="vat_refund_verlegd"/>
+                            <field eval="btw_code_2a" name="tax_code_id"/>
+                            <field eval="btw_code_2a" name="ref_tax_code_id"/>
+                            <field name="ref_base_sign" eval="-1"/>
+                            <field name="ref_tax_sign" eval="-1"/>
+                            <field name="type_tax_use">purchase</field>
+                        </record>
+                        <record id="btw_ink2_0_2" model="account.tax.template">
+                            <field name="sequence">99</field>
+                            <field name="chart_template_id" ref="l10nnl_chart_template"/>
+                            <field name="name">BTW te vorderen verlegd (inkopen2)</field>
+                            <field eval="-1.00" name="amount"/>
+                            <field name="type">percent</field>
+                            <field eval="btw_ink2_0" name="parent_id"/>
+                            <field name="account_collected_id" ref="vat_refund_verlegd"/>
+                            <field name="account_paid_id" ref="vat_refund_verlegd"/>
+                            <field eval="btw_code_5b" name="tax_code_id"/>
+                            <field eval="btw_code_5b" name="ref_tax_code_id"/>
+                            <field name="ref_base_sign" eval="-1"/>
+                            <field name="ref_tax_sign" eval="-1"/>
+                            <field name="type_tax_use">purchase</field>
+                        </record>
 <!-- Binnen de EU -->
 <!-- BTW inkoop -->
         <record id="btw_I_6" model="account.tax.template">
+            <field name="sequence">20</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Inkopen import binnen EU laag</field>
-	    <field name="description">6% BTW import binnen EU</field>
+            <field name="description">6% BTW import binnen EU</field>
             <field eval="0.06" name="amount"/>
             <field name="type">percent</field>
             <field eval="True" name="child_depend"/>
             <field eval="omz_code_4b" name="base_code_id"/>
             <field eval="omz_code_4b" name="ref_base_code_id"/>
+            <field name="ref_base_sign" eval="-1"/>
+            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">purchase</field>
         </record>
-				        <record id="btw_I_6_1" model="account.tax.template">
-				            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-				            <field name="name">Inkopen import binnen EU laag(1)</field>
-				            <field eval="1.00" name="amount"/>
-				            <field name="type">percent</field>
-				            <field name="parent_id" ref="btw_I_6"/>
-				            <field name="account_collected_id" ref="vat_payable6"/>
-				            <field name="account_paid_id" ref="vat_payable6"/>
-				            <field eval="btw_code_4b" name="tax_code_id"/>
-				            <field eval="btw_code_4b" name="ref_tax_code_id"/>
-				            <field name="type_tax_use">purchase</field>
-				        </record>
-				        <record id="btw_I_6_2" model="account.tax.template">
-				            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-				            <field name="name">Inkopen import binnen EU laag(2)</field>
-				            <field eval="-1.00" name="amount"/>
-				            <field name="type">percent</field>
-				            <field name="parent_id" ref="btw_I_6"/>
-				            <field name="account_collected_id" ref="vat_refund6"/>
-				            <field name="account_paid_id" ref="vat_refund6"/>
-				            <field eval="btw_code_5b" name="tax_code_id"/>
-				            <field eval="btw_code_5b" name="ref_tax_code_id"/>
-				            <field name="type_tax_use">purchase</field>
-				        </record>
-        <record id="btw_I_19" model="account.tax.template">
+                        <record id="btw_I_6_1" model="account.tax.template">
+                            <field name="sequence">99</field>
+                            <field name="chart_template_id" ref="l10nnl_chart_template"/>
+                            <field name="name">Inkopen import binnen EU laag(1)</field>
+                            <field eval="-1.00" name="amount"/>
+                            <field name="type">percent</field>
+                            <field name="parent_id" ref="btw_I_6"/>
+                            <field name="account_collected_id" ref="vat_payable_low"/>
+                            <field name="account_paid_id" ref="vat_payable_low"/>
+                            <field eval="btw_code_4b" name="tax_code_id"/>
+                            <field eval="btw_code_4b" name="ref_tax_code_id"/>
+                            <field name="ref_base_sign" eval="-1"/>
+                            <field name="ref_tax_sign" eval="-1"/>
+                            <field name="type_tax_use">purchase</field>
+                        </record>
+                        <record id="btw_I_6_2" model="account.tax.template">
+                            <field name="sequence">99</field>
+                            <field name="chart_template_id" ref="l10nnl_chart_template"/>
+                            <field name="name">Inkopen import binnen EU laag(2)</field>
+                            <field eval="1.00" name="amount"/>
+                            <field name="type">percent</field>
+                            <field name="parent_id" ref="btw_I_6"/>
+                            <field name="account_collected_id" ref="vat_refund_low"/>
+                            <field name="account_paid_id" ref="vat_refund_low"/>
+                            <field eval="btw_code_5b" name="tax_code_id"/>
+                            <field eval="btw_code_5b" name="ref_tax_code_id"/>
+                            <field name="ref_base_sign" eval="-1"/>
+                            <field name="ref_tax_sign" eval="-1"/>
+                            <field name="type_tax_use">purchase</field>
+                        </record>
+        <record id="btw_I_21" model="account.tax.template">
+            <field name="sequence">20</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Inkopen import binnen EU hoog</field>
-	    <field name="description">19% BTW import binnen EU</field>
-            <field eval="0.19" name="amount"/>
+            <field name="description">21% BTW import binnen EU</field>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
             <field eval="True" name="child_depend"/>
             <field eval="omz_code_4b" name="base_code_id"/>
             <field eval="omz_code_4b" name="ref_base_code_id"/>
+            <field name="ref_base_sign" eval="-1"/>
+            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">purchase</field>
         </record>
-				        <record id="btw_I_19_1" model="account.tax.template">
-				            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-				            <field name="name">Inkopen import binnen EU hoog(1)</field>
-				            <field eval="1.00" name="amount"/>
-				            <field name="type">percent</field>
-				            <field name="parent_id" ref="btw_I_19"/>
-				            <field name="account_collected_id" ref="vat_payable19"/>
-				            <field name="account_paid_id" ref="vat_payable19"/>
-				            <field eval="btw_code_4b" name="tax_code_id"/>
-				            <field eval="btw_code_4b" name="ref_tax_code_id"/>
-				            <field name="type_tax_use">purchase</field>
-				        </record>
-				        <record id="btw_I_19_2" model="account.tax.template">
-				            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-				            <field name="name">Inkopen import binnen EU hoog(2)</field>
-				            <field eval="-1.00" name="amount"/>
-				            <field name="type">percent</field>
-				            <field name="parent_id" ref="btw_I_19"/>
-				            <field name="account_collected_id" ref="vat_refund19"/>
-				            <field name="account_paid_id" ref="vat_refund19"/>
-				            <field eval="btw_code_5b" name="tax_code_id"/>
-				            <field eval="btw_code_5b" name="ref_tax_code_id"/>
-				            <field name="type_tax_use">purchase</field>
-				        </record>
+                        <record id="btw_I_21_1" model="account.tax.template">
+                            <field name="sequence">99</field>
+                            <field name="chart_template_id" ref="l10nnl_chart_template"/>
+                            <field name="name">Inkopen import binnen EU hoog(1)</field>
+                            <field eval="-1.00" name="amount"/>
+                            <field name="type">percent</field>
+                            <field name="parent_id" ref="btw_I_21"/>
+                            <field name="account_collected_id" ref="vat_payable_high"/>
+                            <field name="account_paid_id" ref="vat_payable_high"/>
+                            <field eval="btw_code_4b" name="tax_code_id"/>
+                            <field eval="btw_code_4b" name="ref_tax_code_id"/>
+                            <field name="ref_base_sign" eval="-1"/>
+                            <field name="ref_tax_sign" eval="-1"/>
+                            <field name="type_tax_use">purchase</field>
+                        </record>
+                        <record id="btw_I_21_2" model="account.tax.template">
+                            <field name="sequence">99</field>
+                            <field name="chart_template_id" ref="l10nnl_chart_template"/>
+                            <field name="name">Inkopen import binnen EU hoog(2)</field>
+                            <field eval="1.00" name="amount"/>
+                            <field name="type">percent</field>
+                            <field name="parent_id" ref="btw_I_21"/>
+                            <field name="account_collected_id" ref="vat_refund_high"/>
+                            <field name="account_paid_id" ref="vat_refund_high"/>
+                            <field eval="btw_code_5b" name="tax_code_id"/>
+                            <field eval="btw_code_5b" name="ref_tax_code_id"/>
+                            <field name="ref_base_sign" eval="-1"/>
+                            <field name="ref_tax_sign" eval="-1"/>
+                            <field name="type_tax_use">purchase</field>
+                        </record>
         <record id="btw_I_overig" model="account.tax.template">
+            <field name="sequence">20</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Inkopen import binnen EU overig</field>
-	    <field name="description">0% BTW import binnen EU</field>
+            <field name="description">0% BTW import binnen EU</field>
             <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field eval="True" name="child_depend"/>
             <field eval="omz_code_4b" name="base_code_id"/>
             <field eval="omz_code_4b" name="ref_base_code_id"/>
+            <field name="ref_base_sign" eval="-1"/>
+            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">purchase</field>
         </record>
-				        <record id="btw_I_overig_1" model="account.tax.template">
-				            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-				            <field name="name">Inkopen import binnen EU overig(1)</field>
-				            <field eval="1.00" name="amount"/>
-				            <field name="type">percent</field>
-				            <field name="parent_id" ref="btw_I_overig"/>
-				            <field name="account_collected_id" ref="vat_payable19"/>
-				            <field name="account_paid_id" ref="vat_payable19"/>
-				            <field eval="btw_code_4b" name="tax_code_id"/>
-				            <field eval="btw_code_4b" name="ref_tax_code_id"/>
-				            <field name="type_tax_use">purchase</field>
-				        </record>
-				        <record id="btw_I_overig_2" model="account.tax.template">
-				            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-				            <field name="name">Inkopen import binnen EU overig(2)</field>
-				            <field eval="-1.00" name="amount"/>
-				            <field name="type">percent</field>
-				            <field name="parent_id" ref="btw_I_overig"/>
-				            <field name="account_collected_id" ref="vat_refund19"/>
-				            <field name="account_paid_id" ref="vat_refund19"/>
-				            <field eval="btw_code_5b" name="tax_code_id"/>
-				            <field eval="btw_code_5b" name="ref_tax_code_id"/>
-				            <field name="type_tax_use">purchase</field>
-				        </record>
-<!-- BTW verkoop -->				        
+                        <record id="btw_I_overig_1" model="account.tax.template">
+                            <field name="sequence">99</field>
+                            <field name="chart_template_id" ref="l10nnl_chart_template"/>
+                            <field name="name">Inkopen import binnen EU overig(1)</field>
+                            <field eval="-1.00" name="amount"/>
+                            <field name="type">percent</field>
+                            <field name="parent_id" ref="btw_I_overig"/>
+                            <field name="account_collected_id" ref="vat_payable_high"/>
+                            <field name="account_paid_id" ref="vat_payable_high"/>
+                            <field eval="btw_code_4b" name="tax_code_id"/>
+                            <field eval="btw_code_4b" name="ref_tax_code_id"/>
+                            <field name="ref_base_sign" eval="-1"/>
+                            <field name="ref_tax_sign" eval="-1"/>
+                            <field name="type_tax_use">purchase</field>
+                        </record>
+                        <record id="btw_I_overig_2" model="account.tax.template">
+                            <field name="sequence">99</field>
+                            <field name="chart_template_id" ref="l10nnl_chart_template"/>
+                            <field name="name">Inkopen import binnen EU overig(2)</field>
+                            <field eval="1.00" name="amount"/>
+                            <field name="type">percent</field>
+                            <field name="parent_id" ref="btw_I_overig"/>
+                            <field name="account_collected_id" ref="vat_refund_high"/>
+                            <field name="account_paid_id" ref="vat_refund_high"/>
+                            <field eval="btw_code_5b" name="tax_code_id"/>
+                            <field eval="btw_code_5b" name="ref_tax_code_id"/>
+                            <field name="ref_base_sign" eval="-1"/>
+                            <field name="ref_tax_sign" eval="-1"/>
+                            <field name="type_tax_use">purchase</field>
+                        </record>
+<!-- BTW verkoop -->                        
         <record id="btw_X0" model="account.tax.template">
+            <field name="sequence">20</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Verkopen export binnen EU</field>
-	    <field name="description">BTW export binnen EU</field>
+            <field name="description">BTW export binnen EU</field>
             <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_payable0"/>
-            <field name="account_paid_id" ref="vat_refund0"/>
+            <field name="account_paid_id" ref="vat_payable0"/>
             <field name="base_code_id" ref="omz_code_3b"/>
             <field name="ref_base_code_id" ref="omz_code_3b"/>
+            <field name="ref_base_sign" eval="-1"/>
+            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">sale</field>
         </record>
         <record id="btw_X2" model="account.tax.template">
+            <field name="sequence">20</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Installatie/afstandsverkopen binnen EU</field>
-	    <field name="description">Inst./afst.verkopen binnen EU</field>
+            <field name="description">Inst./afst.verkopen binnen EU</field>
             <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_payable0"/>
-            <field name="account_paid_id" ref="vat_refund0"/>
+            <field name="account_paid_id" ref="vat_payable0"/>
             <field name="base_code_id" ref="omz_code_3c"/>
             <field name="ref_base_code_id" ref="omz_code_3c"/>
+            <field name="ref_base_sign" eval="-1"/>
+            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">sale</field>
         </record>
 
 <!-- Buiten de EU -->
 <!-- BTW inkoop -->
         <record id="btw_E1" model="account.tax.template">
+            <field name="sequence">20</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Inkopen import buiten EU laag</field>
-	    <field name="description">BTW import buiten EU</field>
+            <field name="description">BTW import buiten EU</field>
             <field eval="0.06" name="amount"/>
             <field name="type">percent</field>
             <field eval="True" name="child_depend"/>
             <field eval="omz_code_4a" name="base_code_id"/>
             <field eval="omz_code_4a" name="ref_base_code_id"/>
+            <field name="ref_base_sign" eval="-1"/>
+            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">purchase</field>
         </record>
-				        <record id="btw_E1_1" model="account.tax.template">
-				            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-				            <field name="name">Inkopen import buiten EU laag(1)</field>
-				            <field eval="1.00" name="amount"/>
-				            <field name="type">percent</field>
-				            <field name="parent_id" ref="btw_E1"/>
-				            <field name="account_collected_id" ref="vat_payable6"/>
-				            <field name="account_paid_id" ref="vat_payable6"/>
-				            <field eval="btw_code_4a" name="tax_code_id"/>
-				            <field eval="btw_code_4a" name="ref_tax_code_id"/>
-				            <field name="type_tax_use">purchase</field>
-				        </record>
-				        <record id="btw_E1_2" model="account.tax.template">
-				            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-				            <field name="name">Inkopen import buiten EU laag(2)</field>
-				            <field eval="-1.00" name="amount"/>
-				            <field name="type">percent</field>
-				            <field name="parent_id" ref="btw_E1"/>
-				            <field name="account_collected_id" ref="vat_refund6"/>
-				            <field name="account_paid_id" ref="vat_refund6"/>
-				            <field eval="btw_code_5b" name="tax_code_id"/>
-				            <field eval="btw_code_5b" name="ref_tax_code_id"/>
-				            <field name="type_tax_use">purchase</field>
-				        </record>
+                        <record id="btw_E1_1" model="account.tax.template">
+                            <field name="sequence">99</field>
+                            <field name="chart_template_id" ref="l10nnl_chart_template"/>
+                            <field name="name">Inkopen import buiten EU laag(1)</field>
+                            <field eval="-1.00" name="amount"/>
+                            <field name="type">percent</field>
+                            <field name="parent_id" ref="btw_E1"/>
+                            <field name="account_collected_id" ref="vat_payable_low"/>
+                            <field name="account_paid_id" ref="vat_payable_low"/>
+                            <field eval="btw_code_4a" name="tax_code_id"/>
+                            <field eval="btw_code_4a" name="ref_tax_code_id"/>
+                            <field name="ref_base_sign" eval="-1"/>
+                            <field name="ref_tax_sign" eval="-1"/>
+                            <field name="type_tax_use">purchase</field>
+                        </record>
+                        <record id="btw_E1_2" model="account.tax.template">
+                            <field name="sequence">99</field>
+                            <field name="chart_template_id" ref="l10nnl_chart_template"/>
+                            <field name="name">Inkopen import buiten EU laag(2)</field>
+                            <field eval="1.00" name="amount"/>
+                            <field name="type">percent</field>
+                            <field name="parent_id" ref="btw_E1"/>
+                            <field name="account_collected_id" ref="vat_refund_low"/>
+                            <field name="account_paid_id" ref="vat_refund_low"/>
+                            <field eval="btw_code_5b" name="tax_code_id"/>
+                            <field eval="btw_code_5b" name="ref_tax_code_id"/>
+                            <field name="ref_base_sign" eval="-1"/>
+                            <field name="ref_tax_sign" eval="-1"/>
+                            <field name="type_tax_use">purchase</field>
+                        </record>
         <record id="btw_E2" model="account.tax.template">
+            <field name="sequence">20</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Inkopen import buiten EU hoog</field>
-	    <field name="description">BTW import buiten EU</field>
-            <field eval="0.19" name="amount"/>
+            <field name="description">BTW import buiten EU</field>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
             <field eval="True" name="child_depend"/>
             <field eval="omz_code_4a" name="base_code_id"/>
             <field eval="omz_code_4a" name="ref_base_code_id"/>
+            <field name="ref_base_sign" eval="-1"/>
+            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">purchase</field>
         </record>
-				        <record id="btw_E2_1" model="account.tax.template">
-				            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-				            <field name="name">Inkopen import buiten EU hoog(1)</field>
-				            <field eval="1.00" name="amount"/>
-				            <field name="type">percent</field>
-				            <field name="parent_id" ref="btw_E2"/>
-				            <field name="account_collected_id" ref="vat_payable19"/>
-				            <field name="account_paid_id" ref="vat_payable19"/>
-				            <field eval="btw_code_4a" name="tax_code_id"/>
-				            <field eval="btw_code_4a" name="ref_tax_code_id"/>
-				            <field name="type_tax_use">purchase</field>
-				        </record>
-				        <record id="btw_E2_2" model="account.tax.template">
-				            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-				            <field name="name">Inkopen import buiten EU hoog(2)</field>
-				            <field eval="-1.00" name="amount"/>
-				            <field name="type">percent</field>
-				            <field name="parent_id" ref="btw_E2"/>
-				            <field name="account_collected_id" ref="vat_refund19"/>
-				            <field name="account_paid_id" ref="vat_refund19"/>
-				            <field eval="btw_code_5b" name="tax_code_id"/>
-				            <field eval="btw_code_5b" name="ref_tax_code_id"/>
-				            <field name="type_tax_use">purchase</field>
-				        </record>
+                        <record id="btw_E2_1" model="account.tax.template">
+                            <field name="sequence">99</field>
+                            <field name="chart_template_id" ref="l10nnl_chart_template"/>
+                            <field name="name">Inkopen import buiten EU hoog(1)</field>
+                            <field eval="-1.00" name="amount"/>
+                            <field name="type">percent</field>
+                            <field name="parent_id" ref="btw_E2"/>
+                            <field name="account_collected_id" ref="vat_payable_high"/>
+                            <field name="account_paid_id" ref="vat_payable_high"/>
+                            <field eval="btw_code_4a" name="tax_code_id"/>
+                            <field eval="btw_code_4a" name="ref_tax_code_id"/>
+                            <field name="ref_base_sign" eval="-1"/>
+                            <field name="ref_tax_sign" eval="-1"/>
+                            <field name="type_tax_use">purchase</field>
+                        </record>
+                        <record id="btw_E2_2" model="account.tax.template">
+                            <field name="sequence">99</field>
+                            <field name="chart_template_id" ref="l10nnl_chart_template"/>
+                            <field name="name">Inkopen import buiten EU hoog(2)</field>
+                            <field eval="1.00" name="amount"/>
+                            <field name="type">percent</field>
+                            <field name="parent_id" ref="btw_E2"/>
+                            <field name="account_collected_id" ref="vat_refund_high"/>
+                            <field name="account_paid_id" ref="vat_refund_high"/>
+                            <field eval="btw_code_5b" name="tax_code_id"/>
+                            <field eval="btw_code_5b" name="ref_tax_code_id"/>
+                            <field name="ref_base_sign" eval="-1"/>
+                            <field name="ref_tax_sign" eval="-1"/>
+                            <field name="type_tax_use">purchase</field>
+                        </record>
         <record id="btw_E_overig" model="account.tax.template">
+            <field name="sequence">20</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Inkopen import buiten EU overig</field>
-	    <field name="description">BTW import buiten EU</field>
-            <field eval="0.19" name="amount"/>
+            <field name="description">BTW import buiten EU</field>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
             <field eval="True" name="child_depend"/>
             <field eval="omz_code_4a" name="base_code_id"/>
             <field eval="omz_code_4a" name="ref_base_code_id"/>
+            <field name="ref_base_sign" eval="-1"/>
+            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">purchase</field>
         </record>
-				        <record id="btw_E_overig_1" model="account.tax.template">
-				            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-				            <field name="name">Inkopen import buiten EU overig(1)</field>
-				            <field eval="1.00" name="amount"/>
-				            <field name="type">percent</field>
-				            <field name="parent_id" ref="btw_E_overig"/>
-				            <field name="account_collected_id" ref="vat_payable19"/>
-				            <field name="account_paid_id" ref="vat_payable19"/>
-				            <field eval="btw_code_4a" name="tax_code_id"/>
-				            <field eval="btw_code_4a" name="ref_tax_code_id"/>
-				            <field name="type_tax_use">purchase</field>
-				        </record>
-				        <record id="btw_E_overig_2" model="account.tax.template">
-				            <field name="chart_template_id" ref="l10nnl_chart_template"/>
-				            <field name="name">Inkopen import buiten EU overig(2)</field>
-				            <field eval="-1.00" name="amount"/>
-				            <field name="type">percent</field>
-				            <field name="parent_id" ref="btw_E_overig"/>
-				            <field name="account_collected_id" ref="vat_refund19"/>
-				            <field name="account_paid_id" ref="vat_refund19"/>
-				            <field eval="btw_code_5b" name="tax_code_id"/>
-				            <field eval="btw_code_5b" name="ref_tax_code_id"/>
-				            <field name="type_tax_use">purchase</field>
-				        </record>
+                        <record id="btw_E_overig_1" model="account.tax.template">
+                            <field name="sequence">99</field>
+                            <field name="chart_template_id" ref="l10nnl_chart_template"/>
+                            <field name="name">Inkopen import buiten EU overig(1)</field>
+                            <field eval="-1.00" name="amount"/>
+                            <field name="type">percent</field>
+                            <field name="parent_id" ref="btw_E_overig"/>
+                            <field name="account_collected_id" ref="vat_payable_high"/>
+                            <field name="account_paid_id" ref="vat_payable_high"/>
+                            <field eval="btw_code_4a" name="tax_code_id"/>
+                            <field eval="btw_code_4a" name="ref_tax_code_id"/>
+                            <field name="ref_base_sign" eval="-1"/>
+                            <field name="ref_tax_sign" eval="-1"/>
+                            <field name="type_tax_use">purchase</field>
+                        </record>
+                        <record id="btw_E_overig_2" model="account.tax.template">
+                            <field name="sequence">99</field>
+                            <field name="chart_template_id" ref="l10nnl_chart_template"/>
+                            <field name="name">Inkopen import buiten EU overig(2)</field>
+                            <field eval="1.00" name="amount"/>
+                            <field name="type">percent</field>
+                            <field name="parent_id" ref="btw_E_overig"/>
+                            <field name="account_collected_id" ref="vat_refund_high"/>
+                            <field name="account_paid_id" ref="vat_refund_high"/>
+                            <field eval="btw_code_5b" name="tax_code_id"/>
+                            <field eval="btw_code_5b" name="ref_tax_code_id"/>
+                            <field name="ref_base_sign" eval="-1"/>
+                            <field name="ref_tax_sign" eval="-1"/>
+                            <field name="type_tax_use">purchase</field>
+                        </record>
 <!-- BTW Verkoop -->
         <record id="btw_X1" model="account.tax.template">
+            <field name="sequence">20</field>
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Verkopen export buiten EU</field>
-	    <field name="description">BTW export buiten EU</field>
+            <field name="description">BTW export buiten EU</field>
             <field eval="0.00" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_payable0"/>
-            <field name="account_paid_id" ref="vat_refund0"/>
+            <field name="account_paid_id" ref="vat_payable0"/>
             <field name="base_code_id" ref="omz_code_3a"/>
             <field name="ref_base_code_id" ref="omz_code_3a"/>
+            <field name="ref_base_sign" eval="-1"/>
+            <field name="ref_tax_sign" eval="-1"/>
             <field name="type_tax_use">sale</field>
         </record>
 	</data>
 
=== added file 'l10n_nl/account_fiscal_position_account_template.xml'
--- l10n_nl/account_fiscal_position_account_template.xml	1970-01-01 00:00:00 +0000
+++ l10n_nl/account_fiscal_position_account_template.xml	2014-04-22 12:10:57 +0000
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- Fiscal Position Account Templates -->
+
+        <!-- Position 2 - NON-EU Countries -->
+        <!-- inkopen laag -->
+        <record
+            id="position_account_non_eu_purchase_low"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_non_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_7001" />
+            <field name="account_dest_id" ref="l10n_nl.a_7017" />
+        </record>
+        <!-- inkopen hoog. NB: id not according to convention! -->
+        <record
+            id="position_account_non_eu_purchase_high"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_non_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_expense" />
+            <field name="account_dest_id" ref="l10n_nl.a_7018" />
+        </record>
+        <!-- inkopen overig -->
+        <record
+            id="position_account_non_eu_purchase_other"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_non_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_7003" />
+            <field name="account_dest_id" ref="l10n_nl.a_7019" />
+        </record>
+        <!-- verkopen fabricage -->
+        <!-- verkopen laag -->
+        <record
+            id="position_account_non_eu_production_sales_low"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_non_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_8001" />
+            <field name="account_dest_id" ref="l10n_nl.a_8020" />
+        </record>     
+        <!-- verkopen hoog -->
+        <record
+            id="position_account_non_eu_production_sales_high"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_non_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_8002" />
+            <field name="account_dest_id" ref="l10n_nl.a_8020" />
+        </record>   
+        <!-- verkopen overig -->
+        <record
+            id="position_account_non_eu_sales_production_other"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_non_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_8003" />
+            <field name="account_dest_id" ref="l10n_nl.a_8020" />
+        </record>  
+        <!-- verkopen handel -->
+        <!-- verkopen laag -->
+        <record
+            id="position_account_non_eu_sales_trade_low"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_non_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_8011" />
+            <field name="account_dest_id" ref="l10n_nl.a_8021" />
+        </record>     
+        <!-- verkopen hoog -->
+        <record
+            id="position_account_non_eu_sales_trade_high"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_non_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_sale" />
+            <field name="account_dest_id" ref="l10n_nl.a_8021" />
+        </record>   
+        <!-- verkopen overig -->
+        <record
+            id="position_account_non_eu_sales_trade_other"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_non_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_8013" />
+            <field name="account_dest_id" ref="l10n_nl.a_8021" />
+        </record>   
+        <!-- verkopen diensten fabricage -->
+        <!-- verkopen laag -->
+        <record
+            id="position_account_non_eu_sales_service_production_low"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_non_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_8041" />
+            <field name="account_dest_id" ref="l10n_nl.a_8060" />
+        </record>     
+        <!-- verkopen hoog -->
+        <record
+            id="position_account_non_eu_sales_service_production_high"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_non_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_8042" />
+            <field name="account_dest_id" ref="l10n_nl.a_8060" />
+        </record>   
+        <!-- verkopen overig -->
+        <record
+            id="position_account_non_eu_sales_service_production_other"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_non_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_8043" />
+            <field name="account_dest_id" ref="l10n_nl.a_8060" />
+        </record>  
+        <!-- verkopen diensten handel -->
+        <!-- verkopen laag -->
+        <record
+            id="position_account_non_eu_sales_service_trade_low"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_non_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_8051" />
+            <field name="account_dest_id" ref="l10n_nl.a_8061" />
+        </record>     
+        <!-- verkopen hoog -->
+        <record
+            id="position_account_non_eu_sales_service_trade_high"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_non_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_8052" />
+            <field name="account_dest_id" ref="l10n_nl.a_8061" />
+        </record>   
+        <!-- verkopen overig: is er niet?? -->
+        
+        <!-- Position 3 - EU Countries -->
+        <!-- inkopen laag -->
+        <record
+            id="position_account_eu_purchase_low"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_7001" />
+            <field name="account_dest_id" ref="l10n_nl.a_7014" />
+        </record>
+        <!-- inkopen hoog -->
+        <record
+            id="position_account_eu_purchase_high"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_expense" />
+            <field name="account_dest_id" ref="l10n_nl.a_7015" />
+        </record>
+        <!-- inkopen overig -->
+        <record
+            id="position_account_eu_purchase_other"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_7003" />
+            <field name="account_dest_id" ref="l10n_nl.a_7016" />
+        </record>
+        <!-- verkopen fabricage -->
+        <!-- verkopen laag -->
+        <record
+            id="position_account_eu_sales_production_low"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_8001" />
+            <field name="account_dest_id" ref="l10n_nl.a_8000" />
+        </record>     
+        <!-- verkopen hoog -->
+        <record
+            id="position_account_eu_sales_production_high"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_8002" />
+            <field name="account_dest_id" ref="l10n_nl.a_8000" />
+        </record>   
+        <!-- verkopen overig -->
+        <record
+            id="position_account_eu_sales_production_other"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_8003" />
+            <field name="account_dest_id" ref="l10n_nl.a_8000" />
+        </record>  
+        <!-- verkopen handel -->
+        <!-- verkopen laag -->
+        <record
+            id="position_account_eu_sales_trade_low"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_8011" />
+            <field name="account_dest_id" ref="l10n_nl.a_8010" />
+        </record>     
+        <!-- verkopen hoog -->
+        <record
+            id="position_account_eu_sales_trade_high"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_sale" />
+            <field name="account_dest_id" ref="l10n_nl.a_8010" />
+        </record>   
+        <!-- verkopen overig -->
+        <record
+            id="position_account_eu_sales_trade_other"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_8013" />
+            <field name="account_dest_id" ref="l10n_nl.a_8010" />
+        </record>   
+        <!-- verkopen diensten fabricage -->
+        <!-- verkopen laag -->
+        <record
+            id="position_account_eu_sales_service_production_low"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_8041" />
+            <field name="account_dest_id" ref="l10n_nl.a_8040" />
+        </record>     
+        <!-- verkopen hoog -->
+        <record
+            id="position_account_eu_sales_service_production_high"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_8042" />
+            <field name="account_dest_id" ref="l10n_nl.a_8040" />
+        </record>   
+        <!-- verkopen overig -->
+        <record
+            id="position_account_eu_sales_service_production_other"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_8043" />
+            <field name="account_dest_id" ref="l10n_nl.a_8040" />
+        </record>  
+        <!-- verkopen diensten handel -->
+        <!-- verkopen laag -->
+        <record
+            id="position_account_eu_sales_service_trade_low"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_8051" />
+            <field name="account_dest_id" ref="l10n_nl.a_8050" />
+        </record>     
+        <!-- verkopen hoog -->
+        <record
+            id="position_account_eu_sales_service_trade_high"
+            model="account.fiscal.position.account.template">
+            <field name="position_id"     ref="fiscal_position_template_eu" />
+            <field name="account_src_id"  ref="l10n_nl.a_8052" />
+            <field name="account_dest_id" ref="l10n_nl.a_8050" />
+        </record>   
+        <!-- verkopen overig: is er niet?? -->
+
+    </data>
+</openerp>
 \ No newline at end of file
 
=== added file 'l10n_nl/account_fiscal_position_tax_template.xml'
--- l10n_nl/account_fiscal_position_tax_template.xml	1970-01-01 00:00:00 +0000
+++ l10n_nl/account_fiscal_position_tax_template.xml	2014-04-22 12:10:57 +0000
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <!-- account.fiscal.position.tax.template -->
+        
+        <!-- Position 2 - NON-EU Countries -->
+        <!--  All sales tax will become 0 -->
+        <record id="position_tax_extracom_1" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_non_eu"/>
+            <field name="tax_src_id" ref="l10n_nl.btw_0"/>
+            <field name="tax_dest_id" ref="l10n_nl.btw_X1"/>
+        </record>
+        <record id="position_tax_extracom_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_non_eu"/>
+            <field name="tax_src_id" ref="l10n_nl.btw_6"/>
+            <field name="tax_dest_id" ref="l10n_nl.btw_X1"/>
+        </record>
+        <record id="position_tax_extracom_3" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_non_eu"/>
+            <field name="tax_src_id" ref="l10n_nl.btw_21"/>
+            <field name="tax_dest_id" ref="l10n_nl.btw_X1"/>
+        </record>
+        <record id="position_tax_extracom_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_non_eu"/>
+            <field name="tax_src_id" ref="l10n_nl.btw_overig"/>
+            <field name="tax_dest_id" ref="l10n_nl.btw_X1"/>
+        </record>
+        
+        <!-- VAT on buying from outside the EU -->
+        <!-- VAT low -->
+        <record id="position_tax_extracom_5" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_non_eu"/>
+            <field name="tax_src_id" ref="l10n_nl.btw_6_buy"/>
+            <field name="tax_dest_id" ref="l10n_nl.btw_E1"/>
+        </record>
+        <!-- VAT high -->
+        <record id="position_tax_extracom_6" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_non_eu"/>
+            <field name="tax_src_id" ref="l10n_nl.btw_21_buy"/>
+            <field name="tax_dest_id" ref="l10n_nl.btw_E2"/>
+        </record>
+        <!-- VAT other -->
+        <record id="position_tax_extracom_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_non_eu"/>
+            <field name="tax_src_id" ref="l10n_nl.btw_overig_buy"/>
+            <field name="tax_dest_id" ref="l10n_nl.btw_E_overig"/>
+        </record>
+        <!-- Belgian schema has many more lines here.... -->
+        
+        <!-- Position 3 - EU Countries -->
+        <record id="position_tax_intracom_1" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_eu"/>
+            <field name="tax_src_id" ref="l10n_nl.btw_0"/>
+            <field name="tax_dest_id" ref="l10n_nl.btw_X0"/>
+        </record>
+        <record id="position_tax_intracom_2" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_eu"/>
+            <field name="tax_src_id" ref="l10n_nl.btw_6"/>
+            <field name="tax_dest_id" ref="l10n_nl.btw_X0"/>
+        </record>
+        <record id="position_tax_intracom_3" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_eu"/>
+            <field name="tax_src_id" ref="l10n_nl.btw_21"/>
+            <field name="tax_dest_id" ref="l10n_nl.btw_X0"/>
+        </record>
+        <record id="position_tax_intracom_4" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_eu"/>
+            <field name="tax_src_id" ref="l10n_nl.btw_overig"/>
+            <field name="tax_dest_id" ref="l10n_nl.btw_X0"/>
+        </record>
+        
+        <!-- In source-tax we lack the separation of goods and services,
+             therefore no lines now for "Installatie/Afstandsverkopen. -->
+             
+        <!-- Buying from other EU countries (only goods = VAT 0 -->
+        <record id="position_tax_intracom_5" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_eu"/>
+            <field name="tax_src_id" ref="l10n_nl.btw_6_buy"/>
+            <field name="tax_dest_id" ref="l10n_nl.btw_I_6"/>
+        </record>
+        <record id="position_tax_intracom_6" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_eu"/>
+            <field name="tax_src_id" ref="l10n_nl.btw_21_buy"/>
+            <field name="tax_dest_id" ref="l10n_nl.btw_I_21"/>
+        </record>
+        <record id="position_tax_intracom_7" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_eu"/>
+            <field name="tax_src_id" ref="l10n_nl.btw_overig_buy"/>
+            <field name="tax_dest_id" ref="l10n_nl.btw_I_overig"/>
+        </record>
+        
+        <!-- Again, Belgian schema has 17 (!) more records. Missing VAT 0
+             and separation of goods and services .. -->
+
+    </data>
+</openerp>
 
=== added file 'l10n_nl/account_fiscal_position_template.xml'
--- l10n_nl/account_fiscal_position_template.xml	1970-01-01 00:00:00 +0000
+++ l10n_nl/account_fiscal_position_template.xml	2014-04-22 12:10:57 +0000
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- Fiscal Position Templates -->
+        
+        <!--  for the moment no use for this 
+        <record
+            id="fiscal_position_template_domestic"
+            model="account.fiscal.position.template">
+            <field name="name">Binnenland</field>
+            <field
+                name="chart_template_id"
+                ref="l10nnl_chart_template" />
+        </record>
+        -->
+        <record
+            id="fiscal_position_template_eu"
+            model="account.fiscal.position.template">
+	    <field name="name">EU landen</field>
+            <field
+                name="chart_template_id"
+                ref="l10nnl_chart_template" />
+        </record>
+        <record
+            id="fiscal_position_template_non_eu"
+            model="account.fiscal.position.template">
+            <field name="name">Niet-EU landen</field>
+            <field
+                name="chart_template_id"
+                ref="l10nnl_chart_template" />
+        </record>
+    </data>
+</openerp>
 
=== modified file 'mail/mail_message.py'
--- mail/mail_message.py	2012-09-24 14:02:33 +0000
+++ mail/mail_message.py	2014-04-22 12:10:57 +0000
@@ -26,10 +26,10 @@
 import email
 import logging
 import pytz
-import re
 import time
 from email.header import decode_header
 from email.message import Message
+from email.utils import getaddresses
 
 import tools
 from osv import osv
@@ -60,9 +60,15 @@
         return ''.join([tools.ustr(x[0], x[1]) for x in text])
 
 def to_email(text):
-    """Return a list of the email addresses found in ``text``"""
+    """Returns a list of the email addresses found in ``text``                       
+    """
     if not text: return []
-    return re.findall(r'([^ ,<@]+@[^> ,]+)', text)
+    
+    people = getaddresses([text])
+    addresses = [person[1] for person in people]    
+
+    return addresses
+    
 
 class mail_message_common(osv.osv_memory):
     """Common abstract class for holding the main attributes of a 
@@ -534,7 +540,14 @@
                                                 mail_server_id=message.mail_server_id.id,
                                                 context=context)
                 if res:
-                    message.write({'state':'sent', 'message_id': res})
+                    message.write(
+                            {
+                                'state':'sent',
+                                'message_id': res,
+                                'user_id': message.user_id.id or uid,
+                                'date': message.date
+                                    or datetime.datetime.now(),
+                            })
                     message_sent = True
                 else:
                     message.write({'state':'exception'})
 
=== modified file 'mail/mail_thread.py'
--- mail/mail_thread.py	2012-08-10 11:48:38 +0000
+++ mail/mail_thread.py	2014-04-22 12:10:57 +0000
@@ -358,7 +358,7 @@
             match = tools.reference_re.search(references)
             if match: res_id = match.group(1)
         if not res_id:
-            match = tools.res_re.search(msg['subject'])
+            match = tools.res_re.search(msg.get('subject') or '')
             if match: res_id = match.group(1)
         if res_id:
             res_id = int(res_id)
 
=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2012-10-05 10:44:47 +0000
+++ mrp/mrp.py	2014-04-22 12:10:57 +0000
@@ -20,9 +20,10 @@
 ##############################################################################
 
 from datetime import datetime
-from osv import osv, fields
+from osv import osv, fields, orm
 import decimal_precision as dp
 from tools import float_compare
+from tools import DEFAULT_SERVER_DATETIME_FORMAT
 from tools.translate import _
 import netsvc
 import time
@@ -280,8 +281,10 @@
         @param properties: List of related properties.
         @return: False or BoM id.
         """
-        cr.execute('select id from mrp_bom where product_id=%s and bom_id is null order by sequence', (product_id,))
-        ids = map(lambda x: x[0], cr.fetchall())
+        domain = [('product_id', '=', product_id), ('bom_id', '=', False),
+                  '|', ('date_start', '=', False), ('date_start', '<=', time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)),
+                  '|', ('date_stop', '=', False), ('date_stop', '>=', time.strftime(DEFAULT_SERVER_DATETIME_FORMAT))]
+        ids = self.search(cr, uid, domain, order='sequence')
         max_prop = 0
         result = False
         for bom in self.pool.get('mrp.bom').browse(cr, uid, ids):
@@ -434,6 +437,22 @@
         for prod in self.browse(cr, uid, ids, context=context):
             result[prod.id] = prod.date_planned[:10]
         return result
+    
+    def _src_id_default(self, cr, uid, ids, context=None):
+        try:
+            location_model, location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock')
+            self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
+        except (orm.except_orm, ValueError):
+            location_id = False
+        return location_id
+
+    def _dest_id_default(self, cr, uid, ids, context=None):
+        try:
+            location_model, location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock')
+            self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
+        except (orm.except_orm, ValueError):
+            location_id = False
+        return location_id
 
     _columns = {
         'name': fields.char('Reference', size=64, required=True),
@@ -481,6 +500,8 @@
         'state': lambda *a: 'draft',
         'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'product_qty':  lambda *a: 1.0,
+        'location_src_id': _src_id_default,
+        'location_dest_id': _dest_id_default,
         'name': lambda x, y, z, c: x.pool.get('ir.sequence').get(y, z, 'mrp.production') or '/',
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.production', context=c),
     }
 
=== modified file 'mrp/security/mrp_security.xml'
--- mrp/security/mrp_security.xml	2011-12-19 16:54:40 +0000
+++ mrp/security/mrp_security.xml	2014-04-22 12:10:57 +0000
@@ -36,7 +36,7 @@
         <field name="name">mrp_bom multi-company</field>
         <field name="model_id" search="[('model','=','mrp.bom')]" model="ir.model"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+        <field name="domain_force">['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
     </record>
 
     <record model="ir.rule" id="mrp_routing_rule">
 
=== modified file 'mrp_repair/mrp_repair.py'
--- mrp_repair/mrp_repair.py	2012-01-31 13:36:57 +0000
+++ mrp_repair/mrp_repair.py	2014-04-22 12:10:57 +0000
@@ -349,7 +349,8 @@
         return True
 
     def wkf_invoice_create(self, cr, uid, ids, *args):
-        return self.action_invoice_create(cr, uid, ids)
+        self.action_invoice_create(cr, uid, ids)
+        return True
 
     def action_invoice_create(self, cr, uid, ids, group=False, context=None):
         """ Creates invoice(s) for repair order.
 
=== modified file 'procurement/procurement.py'
--- procurement/procurement.py	2013-02-27 11:25:39 +0000
+++ procurement/procurement.py	2014-04-22 12:10:57 +0000
@@ -81,7 +81,7 @@
     """
     _name = "procurement.order"
     _description = "Procurement"
-    _order = 'priority,date_planned desc'
+    _order = 'priority desc,date_planned'
     _log_create = False
     _columns = {
         'name': fields.char('Reason', size=64, required=True, help='Procurement name.'),
 
=== modified file 'product/pricelist.py'
--- product/pricelist.py	2012-01-31 13:36:57 +0000
+++ product/pricelist.py	2014-04-22 12:10:57 +0000
@@ -199,29 +199,52 @@
                 categ_ids = _create_parent_category_list(categ_id, [categ_id])
                 if categ_ids:
                     categ_where = '(categ_id IN (' + ','.join(map(str, categ_ids)) + '))'
+                    categ_where_i = '(i.categ_id IN (' + ','.join(map(str, categ_ids)) + '))'
                 else:
                     categ_where = '(categ_id IS NULL)'
+                    categ_where_i = '(i.categ_id IS NULL)'
 
                 if partner:
                     partner_where = 'base <> -2 OR %s IN (SELECT name FROM product_supplierinfo WHERE product_id = %s) '
-                    partner_args = (partner, product_id)
+                    partner_args = (partner, tmpl_id)
                 else:
                     partner_where = 'base <> -2 '
                     partner_args = ()
-
-                cr.execute(
-                    'SELECT i.*, pl.currency_id '
-                    'FROM product_pricelist_item AS i, '
-                        'product_pricelist_version AS v, product_pricelist AS pl '
-                    'WHERE (product_tmpl_id IS NULL OR product_tmpl_id = %s) '
-                        'AND (product_id IS NULL OR product_id = %s) '
-                        'AND (' + categ_where + ' OR (categ_id IS NULL)) '
-                        'AND (' + partner_where + ') '
-                        'AND price_version_id = %s '
-                        'AND (min_quantity IS NULL OR min_quantity <= %s) '
-                        'AND i.price_version_id = v.id AND v.pricelist_id = pl.id '
-                    'ORDER BY sequence',
-                    (tmpl_id, product_id) + partner_args + (pricelist_version_ids[0], qty))
+                  
+                query = (  
+                'SELECT '
+                    'i.*, pl.currency_id , p.* '
+                'FROM '
+                    'product_pricelist_item AS i '
+                    'JOIN product_pricelist_version AS v '
+                        'ON i.price_version_id = v.id '
+                    'JOIN product_pricelist AS pl '
+                        'ON v.pricelist_id = pl.id '
+                    'LEFT OUTER JOIN ( '
+                        'WITH RECURSIVE subtree(depth, categ_id, parent_id, name) AS ( '
+                                'SELECT 0, id, parent_id, name FROM product_category WHERE parent_id is NULL '
+                            'UNION '
+                                'SELECT depth+1, m.id, m.parent_id, m.name '
+                                'FROM subtree t, product_category m '
+                                'WHERE m.parent_id = t.categ_id '
+                        ') '
+                        'SELECT * '
+                        'FROM subtree '
+                        'WHERE (' + categ_where + ' OR (categ_id IS NULL)) ' 
+                    ') AS p '
+                        'on i.categ_id = p.categ_id '
+                'WHERE '
+                    '(product_tmpl_id IS NULL OR product_tmpl_id = %s) ' 
+                    'AND (product_id IS NULL OR product_id = %s) '
+                    'AND (' + categ_where_i + ' OR (i.categ_id IS NULL)) ' 
+                    'AND (' + partner_where + ') ' 
+                    'AND price_version_id = %s ' 
+                    'AND (min_quantity IS NULL OR min_quantity <= %s) '
+                'ORDER BY ' 
+                    'sequence, depth desc '  
+                ) % ((tmpl_id, product_id) + partner_args + (pricelist_version_ids[0], qty))
+                              
+                cr.execute(query)
                 res1 = cr.dictfetchall()
                 uom_price_already_computed = False
                 for res in res1:
@@ -232,7 +255,7 @@
                             else:
                                 price_tmp = self.price_get(cr, uid,
                                         [res['base_pricelist_id']], product_id,
-                                        qty, context=context)[res['base_pricelist_id']]
+                                        qty, partner=partner, context=context)[res['base_pricelist_id']]
                                 ptype_src = self.browse(cr, uid, res['base_pricelist_id']).currency_id.id
                                 uom_price_already_computed = True
                                 price = currency_obj.compute(cr, uid, ptype_src, res['currency_id'], price_tmp, round=False)
@@ -269,10 +292,17 @@
                                     price_type.field, context=context)[product_id], round=False, context=context)
 
                         if price is not False:
+                            surcharge = res['price_surcharge'] or 0.0 
+                            if 'uom' in context: 
+                                product = products_dict[product_id]
+                                uom = product.uos_id or product.uom_id
+                                surcharge = product_uom_obj._compute_price(cr, uid, uom.id, surcharge, context['uom'])
+                            
                             price_limit = price
                             price = price * (1.0+(res['price_discount'] or 0.0))
                             price = rounding(price, res['price_round']) #TOFIX: rounding with tools.float_rouding
-                            price += (res['price_surcharge'] or 0.0)
+                            price += surcharge
+                            
                             if res['price_min_margin']:
                                 price = max(price, price_limit+res['price_min_margin'])
                             if res['price_max_margin']:
@@ -304,6 +334,7 @@
         res.update({'item_id': {ids[-1]: res_multi.get('item_id', ids[-1])}})
         return res
 
+
 product_pricelist()
 
 
 
=== modified file 'product/product.py'
--- product/product.py	2012-04-03 13:05:28 +0000
+++ product/product.py	2014-04-22 12:10:57 +0000
@@ -611,9 +611,9 @@
                 # Performing a quick memory merge of ids in Python will give much better performance
                 ids = set()
                 ids.update(self.search(cr, user, args + [('default_code',operator,name)], limit=limit, context=context))
-                if len(ids) < limit:
+                if not limit or len(ids) < limit:
                     # we may underrun the limit because of dupes in the results, that's fine
-                    ids.update(self.search(cr, user, args + [('name',operator,name)], limit=(limit-len(ids)), context=context))
+                    ids.update(self.search(cr, user, args + [('name',operator,name)], limit=(limit-len(ids) if limit else limit) , context=context))
                 ids = list(ids)
             if not ids:
                 ptrn = re.compile('(\[(.*?)\])')
 
=== modified file 'product/report/product_label.xsl'
--- product/report/product_label.xsl	2011-01-14 00:11:01 +0000
+++ product/report/product_label.xsl	2014-04-22 12:10:57 +0000
@@ -70,7 +70,7 @@
 				</td>
 			</tr><tr>
 				<td>
-				<barCode><xsl:value-of select="code"/></barCode>
+				<barCode><xsl:value-of select="ean13"/></barCode>
 				</td><td>
 					<para style="nospace"><xsl:value-of select="product"/></para><xsl:text>, </xsl:text>
 					<para style="nospace"><xsl:value-of select="variant"/></para>
 
=== modified file 'project/project_view.xml'
--- project/project_view.xml	2012-03-12 10:20:01 +0000
+++ project/project_view.xml	2014-04-22 12:10:57 +0000
@@ -68,8 +68,8 @@
                             </field>
                         </page>
                         <page string="Billing" groups="account.group_account_invoice">
-                            <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Contact Address"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer" colspan="4" />
+                            <field name="contact_id" string="Contact Address" domain="[('partner_id','=',partner_id)]"  options='{"quick_create": false}' context="{'default_partner_id':partner_id}" />
                             <field name="warn_customer"/>
                             <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                             <newline/>
 
=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml	2012-03-12 11:29:31 +0000
+++ project_issue/project_issue_view.xml	2014-04-22 12:10:57 +0000
@@ -68,7 +68,7 @@
                             <group col="2" colspan="2">
                             <separator colspan="2" string="Contact Information"/>
                             <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
-                            <field name="partner_address_id"  string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
+                            <field name="partner_address_id"  string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"  options='{"quick_create": false}' context="{'default_partner_id':partner_id}" />
                             <field name="email_from"/>
                             </group>
                             <group col="3" colspan="2">
 
=== modified file 'project_mrp/project_procurement.py'
--- project_mrp/project_procurement.py	2011-12-19 16:54:40 +0000
+++ project_mrp/project_procurement.py	2014-04-22 12:10:57 +0000
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
+from openerp.tools.translate import _
 
 class procurement_order(osv.osv):
     _name = "procurement.order"
@@ -37,8 +38,10 @@
         """ Checks if task is done or not.
         @return: True or False.
         """
-        return all(proc.product_id.type != 'service' or (proc.task_id and proc.task_id.state in ('done', 'cancelled')) \
-                    for proc in self.browse(cr, uid, ids, context=context))
+        for p in self.browse(cr, uid, ids, context=context):
+            if (p.product_id.type=='service') and (p.procure_method=='make_to_order') and p.task_id and (p.task_id.state not in ('done', 'cancelled')):
+                return False
+        return True
 
     def check_produce_service(self, cr, uid, procurement, context=None):    
         return True
@@ -79,8 +82,9 @@
                 'description': procurement.note,
                 'project_id':  project and project.id or False,
                 'company_id': procurement.company_id.id,
+                'partner_id': procurement.sale_line_id and procurement.sale_line_id.order_id.partner_id.id,
             },context=context)
-            self.write(cr, uid, [procurement.id], {'task_id': task_id, 'state': 'running'}, context=context)
+            self.write(cr, uid, [procurement.id], {'task_id': task_id, 'state': 'running', 'message':_('Task created.')}, context=context)
         return task_id
 
 procurement_order()
 
=== modified file 'project_timesheet/project_timesheet.py'
--- project_timesheet/project_timesheet.py	2012-01-31 13:36:57 +0000
+++ project_timesheet/project_timesheet.py	2014-04-22 12:10:57 +0000
@@ -142,10 +142,6 @@
                 vals_line['name'] = '%s: %s' % (tools.ustr(task.task_id.name), tools.ustr(vals['name']) or '/')
             if 'user_id' in vals:
                 vals_line['user_id'] = vals['user_id']
-                result = self.get_user_related_details(cr, uid, vals['user_id'])
-                for fld in ('product_id', 'general_account_id', 'journal_id', 'product_uom_id'):
-                    if result.get(fld, False):
-                        vals_line[fld] = result[fld]
                         
             if 'date' in vals:
                 vals_line['date'] = vals['date'][:10]
@@ -153,6 +149,10 @@
                 default_uom = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id
                 vals_line['unit_amount'] = vals['hours']
                 prod_id = vals_line.get('product_id', line_id.product_id.id) # False may be set
+                result = self.get_user_related_details(cr, uid, vals.get('user_id', task.user_id.id))
+                for fld in ('product_id', 'general_account_id', 'journal_id', 'product_uom_id'):
+                    if result.get(fld, False):
+                        vals_line[fld] = result[fld]
 
                 if result.get('product_uom_id',False) and (not result['product_uom_id'] == default_uom):
                     vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, default_uom, vals['hours'], result['product_uom_id'])
@@ -165,7 +165,9 @@
                 if amount_unit and 'amount' in amount_unit.get('value',{}):
                     vals_line['amount'] = amount_unit['value']['amount']
 
-            self.pool.get('hr.analytic.timesheet').write(cr, uid, [line_id.id], vals_line, context=context)
+            #workaround for lp:1023047
+            if vals_line:
+                self.pool.get('hr.analytic.timesheet').write(cr, uid, [line_id.id], vals_line, context=context)
             
         return super(project_work,self).write(cr, uid, ids, vals, context)
 
 
=== modified file 'purchase/purchase.py' (properties changed: -x to +x)
--- purchase/purchase.py	2012-10-09 12:16:14 +0000
+++ purchase/purchase.py	2014-04-22 12:10:57 +0000
@@ -294,6 +294,20 @@
             self.write(cr, uid, [id], {'state' : 'confirmed', 'validator' : uid})
         return True
 
+    def _choose_account_from_po_line(self, cr, uid, po_line, context=None):
+        fiscal_obj = self.pool.get('account.fiscal.position')
+        property_obj = self.pool.get('ir.property')
+        if po_line.product_id:
+            acc_id = po_line.product_id.property_account_expense.id
+            if not acc_id:
+                acc_id = po_line.product_id.categ_id.property_account_expense_categ.id
+            if not acc_id:
+                raise osv.except_osv(_('Error!'), _('Define expense account for this company: "%s" (id:%d).') % (po_line.product_id.name, po_line.product_id.id,))
+        else:
+            acc_id = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category').id
+        fpos = po_line.order_id.fiscal_position or False
+        return fiscal_obj.map_account(cr, uid, fpos, acc_id)
+
     def _prepare_inv_line(self, cr, uid, account_id, order_line, context=None):
         """Collects require data from purchase order line that is used to create invoice line 
         for that purchase order line
@@ -338,8 +352,6 @@
         journal_obj = self.pool.get('account.journal')
         inv_obj = self.pool.get('account.invoice')
         inv_line_obj = self.pool.get('account.invoice.line')
-        fiscal_obj = self.pool.get('account.fiscal.position')
-        property_obj = self.pool.get('ir.property')
 
         for order in self.browse(cr, uid, ids, context=context):
             pay_acc_id = order.partner_id.property_account_payable.id
@@ -351,16 +363,7 @@
             # generate invoice line correspond to PO line and link that to created invoice (inv_id) and PO line
             inv_lines = []
             for po_line in order.order_line:
-                if po_line.product_id:
-                    acc_id = po_line.product_id.product_tmpl_id.property_account_expense.id
-                    if not acc_id:
-                        acc_id = po_line.product_id.categ_id.property_account_expense_categ.id
-                    if not acc_id:
-                        raise osv.except_osv(_('Error !'), _('There is no expense account defined for this product: "%s" (id:%d)') % (po_line.product_id.name, po_line.product_id.id,))
-                else:
-                    acc_id = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category').id
-                fpos = order.fiscal_position or False
-                acc_id = fiscal_obj.map_account(cr, uid, fpos, acc_id)
+                acc_id = self._choose_account_from_po_line(cr, uid, po_line, context=context)
 
                 inv_line_data = self._prepare_inv_line(cr, uid, acc_id, po_line, context=context)
                 inv_line_id = inv_line_obj.create(cr, uid, inv_line_data, context=context)
@@ -539,7 +542,6 @@
          @param context: A standard dictionary
 
          @return: new purchase order id
-
         """
         #TOFIX: merged order line should be unlink
         wf_service = netsvc.LocalService("workflow")
@@ -590,7 +592,8 @@
                 if porder.notes:
                     order_infos['notes'] = (order_infos['notes'] or '') + ('\n%s' % (porder.notes,))
                 if porder.origin:
-                    order_infos['origin'] = (order_infos['origin'] or '') + ' ' + porder.origin
+                    if not porder.origin in order_infos['origin'] and not order_infos['origin'] in porder.origin:
+                        order_infos['origin'] = (order_infos['origin'] or '') + ' ' + porder.origin
 
             for order_line in porder.order_line:
                 line_key = make_key(order_line, ('name', 'date_planned', 'taxes_id', 'price_unit', 'notes', 'product_id', 'move_dest_id', 'account_analytic_id'))
@@ -781,7 +784,7 @@
 
         qty = qty or 1.0
         supplierinfo = False
-        supplierinfo_ids = product_supplierinfo.search(cr, uid, [('name','=',partner_id),('product_id','=',product.id)])
+        supplierinfo_ids = product_supplierinfo.search(cr, uid, [('name', '=', partner_id),('product_id', '=', product.product_tmpl_id.id)])
         if supplierinfo_ids:
             supplierinfo = product_supplierinfo.browse(cr, uid, supplierinfo_ids[0], context=context)
             if supplierinfo.product_uom.id != uom_id:
@@ -799,8 +802,12 @@
         price = product_pricelist.price_get(cr, uid, [pricelist_id],
                     product.id, qty or 1.0, partner_id, {'uom': uom_id, 'date': date_order})[pricelist_id]
         
-        taxes = account_tax.browse(cr, uid, map(lambda x: x.id, product.supplier_taxes_id))
         fpos = fiscal_position_id and account_fiscal_position.browse(cr, uid, fiscal_position_id, context=context) or False
+        a = product.product_tmpl_id.property_account_expense.id
+        if not a:
+            a = product.categ_id.property_account_expense_categ.id
+        a = account_fiscal_position.map_account(cr, uid, fpos, a)
+        taxes = product.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids)
         taxes_ids = account_fiscal_position.map_tax(cr, uid, fpos, taxes)
         res['value'].update({'price_unit': price, 'taxes_id': taxes_ids})
 
 
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml	2012-10-23 07:56:26 +0000
+++ purchase/purchase_view.xml	2014-04-22 12:10:57 +0000
@@ -173,7 +173,7 @@
                     <notebook colspan="4">
                         <page string="Purchase Order">
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('supplier', '=', True)]" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}"  options='{"quick_create": false}'/>
-                            <field name="partner_address_id" options='{"quick_create": false}'/>
+                            <field name="partner_address_id" options='{"quick_create": false}' context="{'default_partner_id':partner_id}"/>
                             <field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/>
                             <field name="origin" groups="base.group_extended"/>
                             <newline/>
 
=== modified file 'purchase/wizard/purchase_line_invoice.py' (properties changed: -x to +x)
--- purchase/wizard/purchase_line_invoice.py	2011-09-08 09:27:55 +0000
+++ purchase/wizard/purchase_line_invoice.py	2014-04-22 12:10:57 +0000
@@ -48,12 +48,11 @@
         if record_ids:
             res = False
             invoices = {}
-            invoice_obj=self.pool.get('account.invoice')
-            purchase_line_obj=self.pool.get('purchase.order.line')
-            property_obj=self.pool.get('ir.property')
-            account_fiscal_obj=self.pool.get('account.fiscal.position')
-            invoice_line_obj=self.pool.get('account.invoice.line')
-            account_jrnl_obj=self.pool.get('account.journal')
+            invoice_obj = self.pool.get('account.invoice')
+            purchase_obj = self.pool.get('purchase.order')
+            purchase_line_obj = self.pool.get('purchase.order.line')
+            invoice_line_obj = self.pool.get('account.invoice.line')
+            account_jrnl_obj = self.pool.get('account.journal')
 
             def multiple_order_invoice_notes(orders):
                 notes = ""
@@ -62,7 +61,6 @@
                 return notes
 
 
-
             def make_invoice_by_partner(partner, orders, lines_ids):
                 """
                     create a new invoice for one supplier
@@ -99,37 +97,16 @@
                     order.write({'invoice_ids': [(4, inv_id)]})
                 return inv_id
 
-            for line in purchase_line_obj.browse(cr,uid,record_ids):
-                if (not line.invoiced) and (line.state not in ('draft','cancel')):
+            for line in purchase_line_obj.browse(cr, uid, record_ids, context=context):
+                if (not line.invoiced) and (line.state not in ('draft', 'cancel')):
                     if not line.partner_id.id in invoices:
                         invoices[line.partner_id.id] = []
-                    if line.product_id:
-                        a = line.product_id.product_tmpl_id.property_account_expense.id
-                        if not a:
-                            a = line.product_id.categ_id.property_account_expense_categ.id
-                        if not a:
-                            raise osv.except_osv(_('Error !'),
-                                    _('There is no expense account defined ' \
-                                            'for this product: "%s" (id:%d)') % \
-                                            (line.product_id.name, line.product_id.id,))
-                    else:
-                        a = property_obj.get(cr, uid,
-                                'property_account_expense_categ', 'product.category',
-                                context=context).id
-                    fpos = line.order_id.fiscal_position or False
-                    a = account_fiscal_obj.map_account(cr, uid, fpos, a)
-                    inv_id = invoice_line_obj.create(cr, uid, {
-                        'name': line.name,
-                        'origin': line.order_id.name,
-                        'account_id': a,
-                        'price_unit': line.price_unit,
-                        'quantity': line.product_qty,
-                        'uos_id': line.product_uom.id,
-                        'product_id': line.product_id.id or False,
-                        'invoice_line_tax_id': [(6, 0, [x.id for x in line.taxes_id])],
-                        'note': line.notes,
-                        'account_analytic_id': line.account_analytic_id and line.account_analytic_id.id or False,
-                    })
+                        
+                    acc_id = purchase_obj._choose_account_from_po_line(cr, uid, line, context=context)
+                    inv_line_data = purchase_obj._prepare_inv_line(cr, uid, acc_id, line, context=context)
+                    inv_line_data.update({'origin': line.order_id.name})
+                    inv_id = invoice_line_obj.create(cr, uid, inv_line_data, context=context)
+                    
                     purchase_line_obj.write(cr, uid, [line.id], {'invoiced': True, 'invoice_lines': [(4, inv_id)]})
                     invoices[line.partner_id.id].append((line,inv_id))
 
 
=== modified file 'purchase_requisition/wizard/purchase_requisition_partner_view.xml'
--- purchase_requisition/wizard/purchase_requisition_partner_view.xml	2011-01-14 00:11:01 +0000
+++ purchase_requisition/wizard/purchase_requisition_partner_view.xml	2014-04-22 12:10:57 +0000
@@ -9,7 +9,7 @@
               	<form string="Purchase Requisition">
               	 <group colspan="2" col="2">
               		 <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-              		 <field domain="[('partner_id','=',partner_id)]" name="partner_address_id"/>
+              		 <field name="partner_address_id" domain="[('partner_id','=',partner_id)]" options='{"quick_create": false}' context="{'default_partner_id':partner_id}" />
               		  <separator string="" colspan="4" />
 		            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
 		            		<button icon="gtk-ok" name="create_order" string="Create Quotation" type="object"/>
 
=== modified file 'sale/report/sale_order.rml'
--- sale/report/sale_order.rml	2012-12-17 09:49:00 +0000
+++ sale/report/sale_order.rml	2014-04-22 12:10:57 +0000
@@ -126,33 +126,8 @@
     <images/>
   </stylesheet>
   <story>
-  <pto>
   <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
   <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
-  <pto_header>
-    <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Description</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">VAT</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Quantity</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Unit Price</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Disc.(%)</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Price</para>
-        </td>
-      </tr>
-    </blockTable>
-  </pto_header>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
@@ -233,6 +208,31 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+    <pto>
+    <pto_header>
+      <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Description</para>
+         </td>
+         <td>
+            <para style="terp_tblheader_Details_Centre">VAT</para>
+         </td>
+         <td>
+           <para style="terp_tblheader_Details_Right">Quantity</para>
+         </td>
+         <td>
+           <para style="terp_tblheader_Details_Right">Unit Price</para>
+         </td>
+         <td>
+           <para style="terp_tblheader_Details_Centre">Disc.(%)</para>
+         </td>
+         <td>
+           <para style="terp_tblheader_Details_Right">Price</para>
+         </td>
+        </tr>
+      </blockTable>
+    </pto_header>
     <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
       <tr>
         <td>
@@ -310,6 +310,7 @@
         </tr>
       </blockTable>
     </section>
+    </pto>
     <blockTable colWidths="381.0,60.0,93.0" style="Table6">
       <tr>
         <td>
@@ -365,6 +366,5 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-  </pto>
   </story>
 </document>
 
=== modified file 'sale/report/sale_report_view.xml'
--- sale/report/sale_report_view.xml	2011-12-19 16:54:40 +0000
+++ sale/report/sale_report_view.xml	2014-04-22 12:10:57 +0000
@@ -52,7 +52,7 @@
             <search string="Sales Analysis">
                 <group>
                     <filter icon="terp-go-year" string="Year" name="year"
-                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
+                        domain="[('date','&lt;=', time.strftime('%%Y-12-31')),('date','&gt;=',time.strftime('%%Y-01-01'))]"
                         help="Sales order created in current year"/>
                     <separator orientation="vertical"/>
                     <filter icon="terp-go-month" string="Month"
 
=== modified file 'sale/sale.py'
--- sale/sale.py	2012-10-09 12:16:14 +0000
+++ sale/sale.py	2014-04-22 12:10:57 +0000
@@ -756,7 +756,7 @@
         return {
             'name': pick_name,
             'origin': order.name,
-            'date': order.date_order,
+            'date': order.date_confirm,
             'type': 'out',
             'state': 'auto',
             'move_type': order.picking_policy,
@@ -822,7 +822,7 @@
             if line.state == 'done':
                 continue
 
-            date_planned = self._get_date_planned(cr, uid, order, line, order.date_order, context=context)
+            date_planned = self._get_date_planned(cr, uid, order, line, order.date_confirm, context=context)
 
             if line.product_id:
                 if line.product_id.product_tmpl_id.type in ('product', 'consu'):
@@ -1206,6 +1206,7 @@
         product_uom_obj = self.pool.get('product.uom')
         partner_obj = self.pool.get('res.partner')
         product_obj = self.pool.get('product.product')
+        fpos_obj = self.pool.get('account.fiscal.position')
         context = dict(context, lang=lang, partner_id=partner_id)
         if partner_id:
             lang = partner_obj.browse(cr, uid, partner_id, context=context).lang
@@ -1241,7 +1242,12 @@
         fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position, context=context) or False
         if update_tax: #The quantity only have changed
             result['delay'] = (product_obj.sale_delay or 0.0)
-            result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id)
+            a = product_obj.product_tmpl_id.property_account_income.id
+            if not a:
+                a = product_obj.categ_id.property_account_income_categ.id
+            a = fpos_obj.map_account(cr, uid, fpos, a)
+            taxes = product_obj.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids)
+            result['tax_id'] = fpos_obj.map_tax(cr, uid, fpos, taxes)
             result.update({'type': product_obj.procure_method})
 
         if not flag:
 
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml	2013-01-02 11:50:01 +0000
+++ sale/sale_view.xml	2014-04-22 12:10:57 +0000
@@ -116,9 +116,9 @@
                     <notebook colspan="5">
                         <page string="Sales Order">
                             <field name="partner_id" options='{"quick_create": false}' on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="partner_order_id" on_change="onchange_partner_order_id(partner_order_id, partner_invoice_id, partner_shipping_id)" options='{"quick_create": false}'/>
-                            <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="base.group_extended" options='{"quick_create": false}'/>
-                            <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id" groups="base.group_extended" options='{"quick_create": false}'/>
+                            <field domain="[('partner_id','=',partner_id)]" name="partner_order_id" on_change="onchange_partner_order_id(partner_order_id, partner_invoice_id, partner_shipping_id)" options='{"quick_create": false}'  context="{'default_partner_id':partner_id}"/>
+                            <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="base.group_extended" options='{"quick_create": false}' context="{'default_partner_id':partner_id}"/>
+                            <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id" groups="base.group_extended" options='{"quick_create": false}' context="{'default_partner_id':partner_id}"/>
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                             <field name="project_id" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="analytic.group_analytic_accounting" domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id), ('parent_id', '!=', False)]"/>
                             <newline/>
 
=== modified file 'stock/report/report_stock_move.py'
--- stock/report/report_stock_move.py	2013-04-04 12:46:09 +0000
+++ stock/report/report_stock_move.py	2014-04-22 12:10:57 +0000
@@ -153,7 +153,8 @@
         'date': fields.datetime('Date', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
-            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September')]),
+            ('05', 'May'), ('06', 'June'), ('07', 'July'), ('08', 'August'), ('09', 'September'),
+            ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly = True),
         'partner_id':fields.many2one('res.partner.address', 'Partner', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'product_categ_id':fields.many2one('product.category', 'Product Category', readonly=True),
@@ -173,6 +174,8 @@
 CREATE OR REPLACE view report_stock_inventory AS (
     (SELECT
         min(m.id) as id, m.date as date,
+        to_char(m.date, 'YYYY') as year,
+        to_char(m.date, 'MM') as month,
         m.address_id as partner_id, m.location_id as location_id,
         m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
         m.company_id,
@@ -196,6 +199,8 @@
 ) UNION ALL (
     SELECT
         -m.id as id, m.date as date,
+        to_char(m.date, 'YYYY') as year,
+        to_char(m.date, 'MM') as month,
         m.address_id as partner_id, m.location_dest_id as location_id,
         m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
         m.company_id,
 
=== modified file 'stock/stock.py'
--- stock/stock.py	2013-10-02 13:19:11 +0000
+++ stock/stock.py	2014-04-22 12:10:57 +0000
@@ -1268,7 +1268,7 @@
                             'product_uos_qty': product_qty, #TODO: put correct uos_qty
                             'picking_id' : new_picking,
                             'state': 'assigned',
-                            'move_dest_id': False,
+                            'move_dest_id': move.move_dest_id.id,
                             'price_unit': move.price_unit,
                             'product_uom': product_uoms[move.id]
                     }
@@ -2572,7 +2572,7 @@
                             'product_uos_qty': product_qty,
                             'picking_id' : move.picking_id.id,
                             'state': 'assigned',
-                            'move_dest_id': False,
+                            'move_dest_id': move.move_dest_id.id,
                             'price_unit': move.price_unit,
                             }
                 prodlot_id = prodlot_ids[move.id]
 
=== modified file 'stock/wizard/stock_return_picking.py'
--- stock/wizard/stock_return_picking.py	2013-10-01 14:45:37 +0000
+++ stock/wizard/stock_return_picking.py	2014-04-22 12:10:57 +0000
@@ -72,9 +72,10 @@
                     res.update({'invoice_state': 'none'})
             return_history = self.get_return_history(cr, uid, record_id, context)       
             for line in pick.move_lines:
-                qty = line.product_qty - return_history[line.id]
-                if qty > 0:
-                    result1.append({'product_id': line.product_id.id, 'quantity': qty,'move_id':line.id})
+                if line.state <> 'cancel':
+                    qty = line.product_qty - return_history[line.id]
+                    if qty > 0:
+                        result1.append({'product_id': line.product_id.id, 'quantity': qty,'move_id':line.id})
             if 'product_return_moves' in fields:
                 res.update({'product_return_moves': result1})
         return res
@@ -128,7 +129,7 @@
                     # a valid return move will be the exact opposite of ours:
                     #     (src location, dest location) <=> (dest location, src location))
                     if rec.location_dest_id.id == m.location_id.id \
-                        and rec.location_id.id == m.location_dest_id.id:
+                        and rec.location_id.id == m.location_dest_id.id and rec.state != 'cancel':
                         return_history[m.id] += (rec.product_qty * rec.product_uom.factor)
         return return_history
 
@@ -166,9 +167,14 @@
             new_type = 'internal'
         seq_obj_name = 'stock.picking.' + new_type
         new_pick_name = self.pool.get('ir.sequence').get(cr, uid, seq_obj_name)
-        new_picking = pick_obj.copy(cr, uid, pick.id, {'name':'%s-%s-return' % (new_pick_name, pick.name),
-                'move_lines':[], 'state':'draft', 'type':new_type,
-                'date':date_cur, 'invoice_state':data['invoice_state'],})
+        new_picking = pick_obj.copy(cr, uid, pick.id, {
+                                        'name':'%s-%s-return' % (new_pick_name, pick.name),
+                                        'move_lines':[], 
+                                        'state':'draft', 
+                                        'backorder_id': False,
+                                        'type':new_type,
+                                        'date':date_cur, 
+                                        'invoice_state':data['invoice_state'],})
         
         val_id = data['product_return_moves']
         for v in val_id:
 
=== modified file 'users_ldap/users_ldap.py'
--- users_ldap/users_ldap.py	2014-01-27 13:36:44 +0000
+++ users_ldap/users_ldap.py	2014-04-22 12:10:57 +0000
@@ -184,7 +184,7 @@
         """
         
         user_id = False
-        login = tools.ustr(login)
+        login = tools.ustr(login.lower())
         cr.execute("SELECT id, active FROM res_users WHERE login=%s", (login,))
         res = cr.fetchone()
         if res:
 
=== modified file 'warning/warning.py'
--- warning/warning.py	2012-09-06 10:32:09 +0000
+++ warning/warning.py	2014-04-22 12:10:57 +0000
@@ -231,7 +231,7 @@
 class purchase_order_line(osv.osv):
     _inherit = 'purchase.order.line'
     def onchange_product_id(self,cr, uid, ids, pricelist, product, qty, uom,
-            partner_id, date_order=False, fiscal_position=False, date_planned=False,
+            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:
@@ -250,7 +250,7 @@
             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)
+            partner_id, date_order, fiscal_position_id)
 
         if result.get('warning',False):
             warning['title'] = title and title +' & '+result['warning']['title'] or result['warning']['title']
 
=== modified file 'wiki/wiki.py'
--- wiki/wiki.py	2012-03-28 06:02:25 +0000
+++ wiki/wiki.py	2014-04-22 12:10:57 +0000
@@ -81,6 +81,7 @@
         }
         group = self.browse(cr, uid, group_id, context=context)
         value['domain'] = "[('group_id','=',%d)]" % (group.id)
+        value['context'] = "{'default_group_id': %d}" % (group.id)
         if group.method == 'page':
             value['res_id'] = group.home.id
         elif group.method == 'list':
 
=== modified file 'wiki/wizard/wiki_create_menu.py'
--- wiki/wizard/wiki_create_menu.py	2011-01-14 00:11:01 +0000
+++ wiki/wizard/wiki_create_menu.py	2014-04-22 12:10:57 +0000
@@ -66,6 +66,7 @@
         }
         group = obj_wiki_group.browse(cr, uid, group_id, context=context)
         value['domain'] = "[('group_id','=',%d)]" % (group.id)
+        value['context'] = "{'default_group_id': %d}" % (group.id)
         if group.method == 'page':
             value['res_id'] = group.home.id
         elif group.method == 'list':
 
=== modified file 'wiki/wizard/wiki_wiki_page_open.py'
--- wiki/wizard/wiki_wiki_page_open.py	2011-01-14 00:11:01 +0000
+++ wiki/wizard/wiki_wiki_page_open.py	2014-04-22 12:10:57 +0000
@@ -41,6 +41,7 @@
         for group in self.pool.get('wiki.groups').browse(cr, uid, group_ids, context=context):
             value = {
                 'domain': "[('group_id','=',%d)]" % (group.id),
+                'context': "{'default_group_id': %d}" % (group.id),
                 'name': 'Wiki Page',
                 'view_type': 'form',
                 'view_mode': 'form,tree',