Merge lp:~stefan-opener/ocb-addons/7.0-lp1168948-set_tax_code_sequence_from_template into lp:ocb-addons

[Stefan Rijnhart (Opener)]

Automatically derived from https://code.launchpad.net/~therp-nl/openobject-addons/7.0-lp1168948-set_tax_code_sequence_from_template for https://code.launchpad.net/~openerp/openobject-addons/7.0.

[Holger Brunn (Therp) (hbrunn)]

looks good to me

review: Approve (code review)

=== modified file 'account/account.py'
--- account/account.py	2013-04-23 12:57:31 +0000
+++ account/account.py	2013-04-24 10:43:27 +0000
@@ -2718,6 +2718,11 @@
         'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Child Codes'),
         'sign': fields.float('Sign For Parent', required=True),
         'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax Code to appear on invoices."),
+        'sequence': fields.integer(
+            'Sequence', help=(
+                "Determine the display order in the report 'Accounting "
+                "\ Reporting \ Generic Reporting \ Taxes \ Taxes Report'"),
+            ),
     }
 
     _defaults = {
@@ -2750,6 +2755,7 @@
                 'parent_id': tax_code_template.parent_id and ((tax_code_template.parent_id.id in tax_code_template_ref) and tax_code_template_ref[tax_code_template.parent_id.id]) or False,
                 'company_id': company_id,
                 'sign': tax_code_template.sign,
+                'sequence': tax_code_template.sequence,
             }
             #check if this tax code already exists
             rec_list = obj_tax_code.search(cr, uid, [('name', '=', vals['name']),('code', '=', vals['code']),('company_id', '=', vals['company_id'])], context=context)