[MERGE] merged with main trunk

bzr revid: qdp-launchpad@openerp.com-20120208143450-d1m1rjowoj289i7n

diff --cc addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
index 60e64f1,afe7328..f0f5542
--- 1/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
--- 2/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@@ -48,20 -42,20 +48,20 @@@
              <field name="model">l1on_be.vat.declaration</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
 -                              <form string="Save xml">
 -                                      <group colspan="3">
 -                                              <label string="Save the File with '.xml' extension." colspan="2" align="0.0"/><newline/>
 -                                                      <field name="name"/><newline/>
 -                                              <field name="file_save" readonly="True" filename="name"/>
 -                              <newline/>
 -                              <separator colspan="4"/><label/>
 -                                      <button special="cancel" string="Ok" icon="gtk-ok"/>
 -                                      </group>
 -                              </form>
 -                      </field>
 -              </record>
 +                <form string="Save xml">
 +                    <group colspan="3">
 +                        <label string="Save the File with '.xml' extension." colspan="2" align="0.0"/><newline/>
 +                        <field name="name"/><newline/>
-                         <field name="file_save" readonly="True"/>
++                        <field name="file_save" readonly="True" filename="name"/>
 +                        <newline/>
 +                        <separator colspan="4"/><label/>
 +                        <button special="cancel" string="Ok" icon="gtk-ok"/>
 +                    </group>
 +                </form>
 +            </field>
 +        </record>
  
 -              <record id="action_vat_declaration" model="ir.actions.act_window">
 +        <record id="action_vat_declaration" model="ir.actions.act_window">
              <field name="name">Vat Declaraion</field>
              <field name="type">ir.actions.act_window</field>
              <field name="res_model">l1on_be.vat.declaration</field>