diff --git a/addons/account/account.py b/addons/account/account.py
index 73c1018d66b..384ef47e980 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1223,7 +1223,7 @@ class account_move(osv.osv):
         'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}),
         'state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'State', required=True, readonly=True,
-            help='All manually created new journal entry are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'),
+            help='All manually created new journal entries are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'),
         'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
         'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'),
         'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True),
diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py
index 01eab2fbb01..02270b94186 100644
--- a/addons/account/account_bank.py
+++ b/addons/account/account_bank.py
@@ -99,7 +99,6 @@ class bank(osv.osv):
                     'type': 'bank',
                     'company_id': bank.company_id.id,
                     'analytic_journal_id': False,
-                    'currency_id': False,
                     'default_credit_account_id': acc_bank_id,
                     'default_debit_account_id': acc_bank_id,
                     'view_id': view_id_cash
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index fcd630ea78b..39cc471c2f6 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -923,7 +923,6 @@ class account_invoice(osv.osv):
                 'line_id': line,
                 'journal_id': journal_id,
                 'date': date,
-                'type': entry_type,
                 'narration':inv.comment
             }
             period_id = inv.period_id and inv.period_id.id or False
@@ -1081,7 +1080,8 @@ class account_invoice(osv.osv):
             del line['invoice_id']
             for field in ('company_id', 'partner_id', 'account_id', 'product_id',
                           'uos_id', 'account_analytic_id', 'tax_code_id', 'base_code_id'):
-                line[field] = line.get(field, False) and line[field][0]
+                if line.get(field):
+                    line[field] = line[field][0]
             if 'invoice_line_tax_id' in line:
                 line['invoice_line_tax_id'] = [(6,0, line.get('invoice_line_tax_id', [])) ]
         return map(lambda x: (0,0,x), lines)
@@ -1209,7 +1209,7 @@ class account_invoice(osv.osv):
         l2['name'] = name
 
         lines = [(0, 0, l1), (0, 0, l2)]
-        move = {'ref': ref, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date, 'type': entry_type}
+        move = {'ref': ref, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date}
         move_id = self.pool.get('account.move').create(cr, uid, move, context=context)
 
         line_ids = []
diff --git a/addons/l10n_br/data/account_tax_template.xml b/addons/l10n_br/data/account_tax_template.xml
index 58f860e0d90..fcdcb4d30e6 100644
--- a/addons/l10n_br/data/account_tax_template.xml
+++ b/addons/l10n_br/data/account_tax_template.xml
@@ -5,7 +5,6 @@
 		<record id="tax_template_1" model="account.tax.template">
 			<field name="description">IPI</field>
 			<field name="name">IPI</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -21,7 +20,6 @@
 		<record id="tax_template_3" model="account.tax.template">
 			<field name="description">IPI 2%</field>
 			<field name="name">IPI 2%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.02</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -37,7 +35,6 @@
 		<record id="tax_template_4" model="account.tax.template">
 			<field name="description">IPI 3%</field>
 			<field name="name">IPI 3%</field>
-      		<field name="tax_group">vat</field>
 			<field name="amount">0.03</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -53,7 +50,6 @@
 		<record id="tax_template_5" model="account.tax.template">
 			<field name="description">IPI 4%</field>
 			<field name="name">IPI 4%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.04</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -69,7 +65,6 @@
 		<record id="tax_template_6" model="account.tax.template">
 			<field name="description">IPI 5%</field>
 			<field name="name">IPI 5%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.05</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -85,7 +80,6 @@
 		<record id="tax_template_7" model="account.tax.template">
 			<field name="description">IPI 7%</field>
 			<field name="name">IPI 7%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.07</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -101,7 +95,6 @@
 		<record id="tax_template_8" model="account.tax.template">
 			<field name="description">IPI 8%</field>
 			<field name="name">IPI 8%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.08</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -117,7 +110,6 @@
 		<record id="tax_template_9" model="account.tax.template">
 			<field name="description">IPI 10%</field>
 			<field name="name">IPI 10%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.10</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -133,7 +125,6 @@
 		<record id="tax_template_10" model="account.tax.template">
 			<field name="description">IPI 12%</field>
 			<field name="name">IPI 12%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.12</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -149,7 +140,6 @@
 		<record id="tax_template_11" model="account.tax.template">
 			<field name="description">IPI 13%</field>
 			<field name="name">IPI 13%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.13</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -165,7 +155,6 @@
 		<record id="tax_template_12" model="account.tax.template">
 			<field name="description">IPI 15%</field>
 			<field name="name">IPI 15%</field>
-      		<field name="tax_group">vat</field>
 			<field name="amount">0.15</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -181,7 +170,6 @@
 		<record id="tax_template_13" model="account.tax.template">
 			<field name="description">IPI 16%</field>
 			<field name="name">IPI 16%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.16</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -197,7 +185,6 @@
 		<record id="tax_template_14" model="account.tax.template">
 			<field name="description">IPI 18%</field>
 			<field name="name">IPI 18%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.18</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -213,7 +200,6 @@
 		<record id="tax_template_15" model="account.tax.template">
 			<field name="description">IPI 20%</field>
 			<field name="name">IPI 20%</field>
-      		<field name="tax_group">vat</field>
 			<field name="amount">0.20</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -229,7 +215,6 @@
 		<record id="tax_template_16" model="account.tax.template">
 			<field name="description">IPI 22%</field>
 			<field name="name">IPI 22%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.22</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -245,7 +230,6 @@
 		<record id="tax_template_17" model="account.tax.template">
 			<field name="description">IPI 25%</field>
 			<field name="name">IPI 25%</field>
-      		<field name="tax_group">vat</field>
 			<field name="amount">0.25</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -261,7 +245,6 @@
 		<record id="tax_template_18" model="account.tax.template">
 			<field name="description">IPI 27%</field>
 			<field name="name">IPI 27%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.27</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -277,7 +260,6 @@
 		<record id="tax_template_19" model="account.tax.template">
 			<field name="description">IPI 30%</field>
 			<field name="name">IPI 30%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.30</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -293,7 +275,6 @@
 		<record id="tax_template_20" model="account.tax.template">
 			<field name="description">IPI 35%</field>
 			<field name="name">IPI 35%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.35</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -309,7 +290,6 @@
 		<record id="tax_template_21" model="account.tax.template">
 			<field name="description">IPI 40%</field>
 			<field name="name">IPI 40%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.40</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -325,7 +305,6 @@
 		<record id="tax_template_22" model="account.tax.template">
 			<field name="description">IPI 42%</field>
 			<field name="name">IPI 42%</field>
-      		<field name="tax_group">vat</field>
 			<field name="amount">0.42</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -341,7 +320,6 @@
 		<record id="tax_template_23" model="account.tax.template">
 			<field name="description">IPI 45%</field>
 			<field name="name">IPI 45%</field>
-      		<field name="tax_group">vat</field>
 			<field name="amount">0.45</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -357,7 +335,6 @@
 		<record id="tax_template_24" model="account.tax.template">
 			<field name="description">IPI 50%</field>
 			<field name="name">IPI 50%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.50</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -373,7 +350,6 @@
 		<record id="tax_template_25" model="account.tax.template">
 			<field name="description">IPI 60%</field>
 			<field name="name">IPI 60%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.60</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -389,7 +365,6 @@
 		<record id="tax_template_26" model="account.tax.template">
 			<field name="description">IPI 330%</field>
 			<field name="name">IPI 330%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">3.30</field>
 			<field ref="account_template_244" name="account_collected_id"/>
 			<field ref="account_template_44" name="account_paid_id"/>
@@ -405,7 +380,6 @@
 		<record id="tax_template_27" model="account.tax.template">
 			<field name="description">ICMS Interno</field>
 			<field name="name">ICMS Interno</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<field ref="account_template_241" name="account_collected_id"/>
 			<field ref="account_template_42" name="account_paid_id"/>
@@ -421,7 +395,6 @@
 		<record id="tax_template_28" model="account.tax.template">
 			<field name="description">ICMS Externo</field>
 			<field name="name">ICMS Externo</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<field ref="account_template_241" name="account_collected_id"/>
 			<field ref="account_template_42" name="account_paid_id"/>
@@ -437,7 +410,6 @@
 		<record id="tax_template_29" model="account.tax.template">
 			<field name="description">ICMS Subist</field>
 			<field name="name">ICMS Subist</field>
-      		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<field eval="0" name="price_include"/>
 			<field eval="0" name="tax_discount"/>
@@ -451,7 +423,6 @@
 		<record id="tax_template_30" model="account.tax.template">
 			<field name="description">ICMS Externo 7%</field>
 			<field name="name">ICMS Externo 7%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.07</field>
 			<field ref="account_template_241" name="account_collected_id"/>
 			<field ref="account_template_42" name="account_paid_id"/>
@@ -467,7 +438,6 @@
 		<record id="tax_template_31" model="account.tax.template">
 			<field name="description">ICMS Externo 12%</field>
 			<field name="name">ICMS Externo 12%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.12</field>
 			<field ref="account_template_241" name="account_collected_id"/>
 			<field ref="account_template_42" name="account_paid_id"/>
@@ -483,7 +453,6 @@
 		<record id="tax_template_32" model="account.tax.template">
 			<field name="description">ICMS Interno 19%</field>
 			<field name="name">ICMS Interno 19%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.19</field>
 			<field ref="account_template_241" name="account_collected_id"/>
 			<field ref="account_template_42" name="account_paid_id"/>
@@ -499,7 +468,6 @@
 		<record id="tax_template_33" model="account.tax.template">
 			<field name="description">ICMS Interno 26%</field>
 			<field name="name">ICMS Interno 26%</field>
-      		<field name="tax_group">vat</field>
 			<field name="amount">0.26</field>
 			<field ref="account_template_241" name="account_collected_id"/>
 			<field ref="account_template_42" name="account_paid_id"/>
@@ -515,7 +483,6 @@
 		<record id="tax_template_34" model="account.tax.template">
 			<field name="description">PIS</field>
 			<field name="name">PIS</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<field ref="account_template_243" name="account_collected_id"/>
 			<field ref="account_template_49" name="account_paid_id"/>
@@ -531,7 +498,6 @@
 		<record id="tax_template_35" model="account.tax.template">
 			<field name="description">PIS 0,65%</field>
 			<field name="name">PIS 0,65%</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.0065</field>
 			<field ref="account_template_243" name="account_collected_id"/>
 			<field ref="account_template_49" name="account_paid_id"/>
@@ -547,7 +513,6 @@
 		<record id="tax_template_36" model="account.tax.template">
 			<field name="description">COFINS</field>
 			<field name="name">COFINS</field>
-       		<field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<field ref="account_template_242" name="account_collected_id"/>
 			<field ref="account_template_39" name="account_paid_id"/>
@@ -563,7 +528,6 @@
 		<record id="tax_template_37" model="account.tax.template">
 			<field name="description">COFINS 3%</field>
 			<field name="name">COFINS 3%</field>
-            <field name="tax_group">vat</field>
 			<field name="amount">0.03</field>
 			<field ref="account_template_242" name="account_collected_id"/>
 			<field ref="account_template_39" name="account_paid_id"/>
@@ -579,7 +543,6 @@
 		<record id="tax_template_38" model="account.tax.template">
 			<field name="description">IRPJ</field>
 			<field name="name">IRPJ</field>
-            <field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<field eval="0" name="price_include"/>
 			<field eval="1" name="tax_discount"/>
@@ -593,7 +556,6 @@
 		<record id="tax_template_39" model="account.tax.template">
 			<field name="description">IR</field>
 			<field name="name">IR</field>
-            <field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<field eval="0" name="price_include"/>
 			<field eval="1" name="tax_discount"/>
@@ -607,7 +569,6 @@
 		<record id="tax_template_40" model="account.tax.template">
 			<field name="description">ISS</field>
 			<field name="name">ISS</field>
-            <field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<field eval="0" name="price_include"/>
 			<field eval="1" name="tax_discount"/>
@@ -621,7 +582,6 @@
         <record id="tax_template_41" model="account.tax.template">
 			<field name="description">ISS 1%</field>
 			<field name="name">ISS 1%</field>
-            <field name="tax_group">vat</field>
 			<field name="amount">0.01</field>
 			<field eval="0" name="price_include"/>
 			<field eval="1" name="tax_discount"/>
@@ -635,7 +595,6 @@
         <record id="tax_template_42" model="account.tax.template">
 			<field name="description">ISS 2%</field>
 			<field name="name">ISS 2%</field>
-            <field name="tax_group">vat</field>
 			<field name="amount">0.02</field>
 			<field eval="0" name="price_include"/>
 			<field eval="1" name="tax_discount"/>
@@ -649,7 +608,6 @@
         <record id="tax_template_43" model="account.tax.template">
 			<field name="description">ISS 3%</field>
 			<field name="name">ISS 3%</field>
-            <field name="tax_group">vat</field>
 			<field name="amount">0.03</field>
 			<field eval="0" name="price_include"/>
 			<field eval="1" name="tax_discount"/>
@@ -663,7 +621,6 @@
         <record id="tax_template_44" model="account.tax.template">
 			<field name="description">ISS 4%</field>
 			<field name="name">ISS 4%</field>
-            <field name="tax_group">vat</field>
 			<field name="amount">0.04</field>
 			<field eval="0" name="price_include"/>
 			<field eval="1" name="tax_discount"/>
@@ -677,7 +634,6 @@
         <record id="tax_template_45" model="account.tax.template">
 			<field name="description">ISS 5%</field>
 			<field name="name">ISS 5%</field>
-            <field name="tax_group">vat</field>
 			<field name="amount">0.05</field>
 			<field eval="0" name="price_include"/>
 			<field eval="1" name="tax_discount"/>
@@ -691,7 +647,6 @@
 		<record id="tax_template_46" model="account.tax.template">
 			<field name="description">CSLL</field>
 			<field name="name">CSLL</field>
-            <field name="tax_group">vat</field>
 			<field name="amount">0.00</field>
 			<field eval="0" name="price_include"/>
 			<field eval="1" name="tax_discount"/>
@@ -703,4 +658,4 @@
         </record>
         
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_cr/data/account_tax_template.xml b/addons/l10n_cr/data/account_tax_template.xml
index 7626b25b5ad..42b5ca03a13 100644
--- a/addons/l10n_cr/data/account_tax_template.xml
+++ b/addons/l10n_cr/data/account_tax_template.xml
@@ -11,7 +11,6 @@
             <field name="sequence">10</field>
             <field name="amount">13</field>
             <field name="type">percent</field>
-            <!-- <field name="tax_group">vat</field> -->
             <field name="type_tax_use">all</field>
             <field name="applicable_type">true</field>
             <field name="child_depend" eval="False"/>
@@ -34,7 +33,6 @@
             <field name="sequence">10</field>
             <field name="amount">13</field>
             <field name="type">percent</field>
-            <!-- <field name="tax_group">vat</field> -->
             <field name="type_tax_use">all</field>
             <field name="applicable_type">true</field>
             <field name="child_depend" eval="False"/>
diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py
index 6f8aec2dcc9..72ef35ebc4b 100644
--- a/addons/mrp_jit/__openerp__.py
+++ b/addons/mrp_jit/__openerp__.py
@@ -41,7 +41,7 @@ In that case, you can not use priorities any more on the different picking.
 
     """,
     'author': 'OpenERP SA',
-    'depends': ['procurement', 'mrp'],
+    'depends': ['procurement'],
     'update_xml': ['mrp_jit.xml'],
     'demo_xml': [],
     'test': ['test/mrp_jit.yml'],