[MERGE] merged with main trunk

bzr revid: qdp-launchpad@openerp.com-20120208142441-r51m3wxvpp6673dk

diff --cc addons/l10n_be/l10n_be_sequence.xml
index b1a456b,0046652..5c6d66d
--- 1/addons/l10n_be/l10n_be_sequence.xml
--- 2/addons/l10n_be/l10n_be_sequence.xml
+++ b/addons/l10n_be/l10n_be_sequence.xml
@@@ -2,9 -2,23 +2,10 @@@
  <openerp>
        <data>
  
-       #
-       # Sequences for declarantnum will be used in wizard for "Listing of VAT Customers"..in creating xml file
-       #
 -        <!--
 -       Sequences for controlref will be used in wizard for "Listing of VAT Customers"..in creating xml file
 -        -->
 -      
 -      <record model="ir.sequence.type" id="seq_type_controlref">
 -              <field name="name">Controlref</field>
 -              <field name="code">controlref</field>
 -      </record>
 -      <record model="ir.sequence" id="seq_controlref">
 -              <field name="name">Controlref</field>
 -              <field name="code">controlref</field>
 -              <field name="padding">4</field>
 -      </record>
+ 
+         <!--
+       Sequences for declarantnum will be used in wizard for "Listing of VAT Customers"..in creating xml file
+         -->
        <record model="ir.sequence.type" id="seq_type_declarantnum">
                <field name="name">Declarantnum</field>
                <field name="code">declarantnum</field>

diff --cc addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
index d775556,06789f4..5f8defc
--- 1/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
--- 2/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_view.xml
@@@ -6,65 -7,66 +6,65 @@@
          name="Belgium Statements"
          parent="account.menu_finance_legal_statement"/>
  
 -              <record id="view_vat_intra" model="ir.ui.view">
 -                      <field name="name">Partner VAT intra</field>
 -                      <field name="model">partner.vat.intra</field>
 -                      <field name="type">form</field>
 -                      <field name="arch" type="xml">
 -                              <form string="Partner VAT intra">
 -                                      <group width="450">
 -                                              <separator string="Create an XML file for Vat Intra" colspan="4"/>
 -                                              <notebook colspan="4">
 -                                                      <page string="General Information">
 -                                                              <newline/>
 -                                                              <group>
 -                                                              <field name="period_code" colspan="4"/>
 -                                                              <newline/>
 -                                                              <field name="mand_id" colspan="4"/>
 -                                                              <newline/>
 -                                                              <field name="tax_code_id" string="Company" colspan="4" widget="selection"/>
 -                                                              <newline/>
 -                                                              </group>
 -                                                              <separator string="Periods" colspan="4"/>
 -                                                              <field name="period_ids" nolabel="1" colspan="4"/>
 -                                                              <newline/><label/>
 -                                                              </page>
 -                                                              <page string="European Countries">
 -                                                                      <field name="country_ids" colspan="4" nolabel="1"/>
 -                                                              </page>
 -                                                              </notebook>
 -                                                              <separator colspan="4"/><label/>
 -                                                      <button special="cancel" string="_Close" icon="gtk-cancel"/>
 -                                                      <button name="preview" string="_Preview" type="object" icon="gtk-print"/>
 -                                                      <button name="create_xml" string="Create _XML" type="object" icon="gtk-execute"/>
 -                                      </group>
 -                              </form>
 -                      </field>
 -              </record>
 -
 -              <record id="view_vat_intra_save" model="ir.ui.view">
 -                      <field name="name">Partner VAT intra Save</field>
 -                      <field name="model">partner.vat.intra</field>
 -                      <field name="type">form</field>
 -                      <field name="arch" type="xml">
 -                              <form string="Save XML">
 -                                              <group width="450">
 -                                                      <separator colspan="2" string="Note: "/><newline/>
 -                                                      <label string="Save the File with '.xml' extension." colspan="2" align="0.0"/><newline/>
 -                                                      <field name="name" colspan="4"/>
 -                                                      <newline/>
 -                                                      <field name="file_save" colspan="4" filename="name"/>
 -                                                      <newline/>
 -                                                      <separator string="Partner With No VAT" colspan="4"/>
 -                                                      <field nolabel="1" name="no_vat" colspan="4"/>
 -                                                      <separator colspan="4"/><label/>
 -                                              <button special="cancel" string="Close" icon="gtk-cancel"/>
 -                                      </group>
 -                              </form>
 -                      </field>
 -              </record>
 +        <record id="view_vat_intra" model="ir.ui.view">
 +            <field name="name">Partner VAT intra</field>
 +            <field name="model">partner.vat.intra</field>
 +            <field name="type">form</field>
 +            <field name="arch" type="xml">
 +                <form string="Partner VAT intra">
 +                    <group width="450">
 +                        <separator string="Intracom VAT Declaration" colspan="4"/>
 +                        <notebook colspan="4">
 +                            <page string="General Information">
 +                                <newline/>
 +                                <field name="period_code"/>
 +                                <field name="mand_id"/>
 +                                <field name="tax_code_id" string="Company" widget="selection" groups="base.group_multi_company"/>
 +                                <newline/>
 +                                <separator string="Periods" colspan="4"/>
 +                                <field name="period_ids" nolabel="1" colspan="4"/>
 +                                <!-- should be unused ?
 +                                <separator string="Advanced Options" colspan="4"/>
 +                                <field name="identification_type"/>
 +                                <field name="other" attrs="{'invisible':[('identification_type','!=','other')], 'required':[('identification_type','=','other')]}"/> -->
 +                                <group colspan="4" groups="base.group_extended">
 +                                    <separator string="Comments" colspan="4"/>
 +                                    <field colspan="4" name="comments" nolabel="1"/>
 +                                </group>
 +                            </page>
 +                            <page string="European Countries" groups="base.group_extended">
 +                                <field name="country_ids" colspan="4" nolabel="1"/>
 +                            </page>
 +                        </notebook>
 +                        <separator colspan="4"/><label/>
 +                        <button special="cancel" string="_Close" icon="gtk-cancel"/>
 +                        <button name="preview" string="_Preview" type="object" icon="gtk-print"/>
 +                        <button name="create_xml" string="Create _XML" type="object" icon="gtk-execute"/>
 +                    </group>
 +                </form>
 +            </field>
 +        </record>
  
 +        <record id="view_vat_intra_save" model="ir.ui.view">
 +            <field name="name">Partner VAT intra Save</field>
 +            <field name="model">partner.vat.intra</field>
 +            <field name="type">form</field>
 +            <field name="arch" type="xml">
 +                <form string="Save XML">
 +                    <group width="450">
 +                        <separator colspan="2" string="Note: "/><newline/>
 +                        <label string="Save the File with '.xml' extension." colspan="2" align="0.0"/><newline/>
 +                        <field name="name" colspan="4"/>
 +                        <newline/>
-                         <field name="file_save" colspan="4"/>
++                        <field name="file_save" colspan="4" filename="name"/>
 +                        <newline/>
 +                        <button special="cancel" string="Close" icon="gtk-cancel" colspan="4"/>
 +                    </group>
 +                </form>
 +            </field>
 +        </record>
  
 -              <record id="action_vat_intra" model="ir.actions.act_window">
 +        <record id="action_vat_intra" model="ir.actions.act_window">
              <field name="name">Partner Vat Intra</field>
              <field name="type">ir.actions.act_window</field>
              <field name="res_model">partner.vat.intra</field>