[MRG] l10n_us:solved issues of cot currency,l10n_ve: error at installation time,l10n_...

bzr revid: tpa@tinyerp.com-20130902105824-xl1pmd3w7h2pernw

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

diff --cc addons/l10n_us/l10n_us_wizard.xml
index 52aaa88,7d53a61..9373935
--- 1/addons/l10n_us/l10n_us_wizard.xml
--- 2/addons/l10n_us/l10n_us_wizard.xml
+++ b/addons/l10n_us/l10n_us_wizard.xml
@@@ -3,6 -8,10 +8,6 @@@
          <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
              <field name="state">open</field>
          </record>
- 
+         
 -        <record id="account.account_configuration_installer_todo" model="ir.actions.todo">
 -                      <field name="state">done</field>
 -              </record>
 -        
      </data>
  </openerp>

diff --cc addons/l10n_ve/data/account_tax.xml
Simple merge