[MERGE] forward port of branch 7.0 up to revid 9625 tde@openerp.com-2…

…0131120154320-gf67wbv3en2f7ral
MarkusTeufelberger · Nov 21, 2013 · 2da1f59 · 2da1f59
2 parents 93e62ee + 2a87b93
commit 2da1f59
Show file tree

Hide file tree

Showing 32 changed files with 122 additions and 96 deletions.
diff --git a/account/data/account_data.xml b/account/data/account_data.xml
@@ -16,7 +16,6 @@
         </record>
 
         <record id="account_payment_term_line_immediate" model="account.payment.term.line">
-            <field name="name">Immediate Payment</field>
             <field name="value">balance</field>
             <field eval="0" name="days"/>
             <field eval="0" name="days2"/>

diff --git a/account/report/account_balance.rml b/account/report/account_balance.rml
@@ -170,6 +170,7 @@
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>

diff --git a/account_budget/report/analytic_account_budget_report.rml b/account_budget/report/analytic_account_budget_report.rml
@@ -182,19 +182,19 @@
       <blockTable colWidths="221.0,82.0,83.0,85.0,57.0" style="Table4">
         <tr>
           <td>
-            <para style="terp_default_9"><font face="Helvetica" size="9.0" color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica" size="8.0"> [[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['name'] ]]</para>
+            <para style="terp_default_9"><font face="Helvetica" size="9.0" color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica" size="8.0"> [[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-Bold'}))) or removeParentNode('font') ]]</font> [[ a['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], currency_obj=company.currency_id) ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['pln'], currency_obj=company.currency_id) ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['pln'], currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['prac'], currency_obj=company.currency_id) ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['prac'], currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['perc']) ]]%</para>
+            <para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['perc']) ]]%</para>
           </td>
         </tr>
       </blockTable>

diff --git a/account_budget/report/budget_report.rml b/account_budget/report/budget_report.rml
@@ -145,19 +145,19 @@
       <blockTable colWidths="185.0,79.0,78.0,81.0,59.0" style="Table4">
         <tr>
           <td>
-            <para style="terp_default_9"><font color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica">[[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ a['name'] ]]</para>
+            <para style="terp_default_9"><font color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica">[[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-Bold'}))) or removeParentNode('font') ]] </font>[[ a['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['pln'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['pln'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['prac'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['prac'], digits=get_digits(dp='Account'), currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['perc'], digits=2) ]]%</para>
+            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['perc'], digits=2) ]]%</para>
           </td>
         </tr>
       </blockTable>

diff --git a/account_budget/report/crossovered_budget_report.rml b/account_budget/report/crossovered_budget_report.rml
@@ -160,19 +160,19 @@
       <blockTable colWidths="205.0,88.0,87.0,90.0,66.0" style="Table4">
         <tr>
           <td>
-            <para style="terp_default_9"><font face="Helvetica" size="10.0" color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica" size="8.0">[[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['name'] ]]</para>
+            <para style="terp_default_9"><font face="Helvetica" size="10.0" color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica" size="8.0">[[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-Bold'}))) or removeParentNode('font') ]]</font> [[ a['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], dp='Account', currency_obj=company.currency_id) ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], dp='Account', currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['pln'], dp='Account', currency_obj=company.currency_id) ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['pln'], dp='Account', currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['prac'], dp='Account', currency_obj=company.currency_id) ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['prac'], dp='Account', currency_obj=company.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['perc'],digits=2) ]]%</para>
+            <para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-Bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['perc'],digits=2) ]]%</para>
           </td>
         </tr>
       </blockTable>

diff --git a/account_followup/account_followup_data.xml b/account_followup/account_followup_data.xml
@@ -162,7 +162,7 @@ ${object.get_followup_table_html() | safe}
             <field name="sequence">0</field>
             <field name="delay">15</field>
             <field name="followup_id" ref="demo_followup1"/>
-            <field name="send-email">True</field>
+            <field name="send_email">True</field>
             <field name="description">
 Dear %(partner_name)s,
 

diff --git a/base_action_rule/security/ir.model.access.csv b/base_action_rule/security/ir.model.access.csv
@@ -1,3 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_base_action_rule,base.action.rule,model_base_action_rule,,1,0,0,0
 access_base_action_rule_config,base.action.rule config,model_base_action_rule,base.group_system,1,1,1,1
+access_base_action_rule_lead_test,access_base_action_rule_lead_test,model_base_action_rule_lead_test,base.group_system,1,1,1,1
diff --git a/document/security/ir.model.access.csv b/document/security/ir.model.access.csv
@@ -15,3 +15,4 @@ access_report_document_user_group_document_manager,report.document.user document
 access_report_document_file_group_document_manager,report.document.file document manager,model_report_document_file,base.group_system,1,0,0,0
 access_report_document_file_group_document,report.document.file document manager,model_report_document_file,base.group_document_user,1,0,0,0
 access_report_document_user_knowledgeuser,report.document.user knowledgeuser,document.model_report_document_user,base.group_document_user,1,0,0,0
+access_document_storage,access_document_storage,model_document_storage,base.group_system,1,1,1,1
diff --git a/fleet/fleet_demo.xml b/fleet/fleet_demo.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+      <!--Users-->
       <record id="base.user_demo" model="res.users">
-        <field name="groups_id" eval="[(4, ref('fleet.group_fleet_user'))]" />
+        <field name="groups_id" eval="[(4, ref('fleet.group_fleet_manager'))]" />
       </record>
 
       <record id="vehicle_state_inshop" model="fleet.vehicle.state">

diff --git a/fleet/fleet_view.xml b/fleet/fleet_view.xml
@@ -43,6 +43,7 @@
                 </form>
             </field>
         </record>
+
         <record model='ir.ui.view' id='fleet_vehicle_model_tree'>
             <field name="name">fleet.vehicle.model.tree</field>
             <field name="model">fleet.vehicle.model</field>
@@ -565,7 +566,7 @@
                 </tree>
             </field>
         </record>
-        <!--
+
         <record model='ir.ui.view' id='fleet_vehicle_odometer_search'>
             <field name="name">fleet.vehicle.odometer.search</field>
             <field name="model">fleet.vehicle.odometer</field>
@@ -575,11 +576,12 @@
                     <field name="value"/>
                     <field name="unit"/>
                     <field name="date"/>
-                    <filter name="groupby_vehicle" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/>
+                    <group expand="0" string="Group By...">
+                        <filter name="groupby_vehicle" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/>
+                    </group>
                 </search>
             </field>
         </record>
-        -->
 
         <record model="ir.ui.view" id="fleet_vehicle_odometer_graph">
            <field name="name">fleet.vehicle.odometer.graph</field>
@@ -671,6 +673,23 @@
                 </tree>
             </field>
         </record>
+
+        <record model='ir.ui.view' id='fleet_vehicle_log_fuel_search'>
+            <field name="name">fleet.vehicle.log.fuel.search</field>
+            <field name="model">fleet.vehicle.log.fuel</field>
+            <field name="arch" type="xml">
+                <search string="Vehicles Fuel Logs" >
+                    <field name="vehicle_id" />
+                    <field name="date"/>
+                    <field name="purchaser_id" />
+                    <field name="liter" />
+                    <field name="amount" sum="Price"/>
+                    <group expand="0" string="Group By...">
+                        <filter name="groupby_vehicle" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/>
+                    </group>
+                </search>
+            </field>
+        </record>
 
         <record model="ir.ui.view" id="fleet_vehicle_log_fuel_graph">
            <field name="name">fleet.vehicle.log.fuel.graph</field>
@@ -690,6 +709,7 @@
             <field name="res_model">fleet.vehicle.log.fuel</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
+            <field name="context">{"search_default_groupby_vehicle" : True}</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to create a new fuel log. 

diff --git a/hr_expense/hr_expense_view.xml b/hr_expense/hr_expense_view.xml
@@ -157,7 +157,7 @@
                     <field name="date"/>
                     <filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
                     <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expenses"/>
-                    <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/>
+                    <filter icon="terp-dolar" domain="['|',('state','=','accepted'),('state','=','done')]" string="To Pay" help="Expenses to Invoice"/>
                     <separator/>
                     <filter domain="[('user_id', '=', uid)]" string="My Expenses"/>
                     <field name="employee_id"/>

diff --git a/l10n_be/__openerp__.py b/l10n_be/__openerp__.py
@@ -65,6 +65,7 @@
         'account_pcmn_belgium.xml',
         'account_tax_code_template.xml',
         'account_chart_template.xml',
+        'account_chart_template.yml',
         'account_tax_template.xml',
         'wizard/l10n_be_account_vat_declaration_view.xml',
         'wizard/l10n_be_vat_intra_view.xml',

diff --git a/l10n_be/account_chart_template.xml b/l10n_be/account_chart_template.xml
@@ -12,7 +12,6 @@
             <field name="property_account_payable" ref="a_pay"/>
             <field name="property_account_expense_categ" ref="a_expense"/>
             <field name="property_account_income_categ" ref="a_sale"/>
-            <field name="spoken_languages" eval="'nl_BE'"/>
             <field name="currency_id" ref="base.EUR"/>
         </record>
 

diff --git a/l10n_be/account_chart_template.yml b/l10n_be/account_chart_template.yml
@@ -0,0 +1,4 @@
+-
+  !python {model: account.chart.template}: |
+      if 'spoken_languages' in self._all_columns:
+        self.write(cr, uid, [ref('l10nbe_chart_template')], {'spoken_languages': 'nl_BE'})
diff --git a/l10n_ch/sterchi_chart/account.xml b/l10n_ch/sterchi_chart/account.xml
@@ -177,14 +177,12 @@
         <record model="account.account.type" id="account_type_receivable">
             <field name="name">Bilan : Debiteurs</field>
             <field name="code">receivable</field>
-            <field name="partner_account" eval="True"/>
             <field name="close_method">unreconciled</field>
             <field name="report_type">none</field>
         </record>
         <record model="account.account.type" id="account_type_payable">
             <field name="name">Bilan : Fournisseurs</field>
             <field name="code">payable</field>
-            <field name="partner_account" eval="True"/>
             <field name="close_method">unreconciled</field>
             <field name="report_type">none</field>
         </record>
@@ -11809,7 +11807,6 @@
             <field name="property_account_income" ref="ch_3200"/>
             <field name="property_account_income_opening" ref="ch_2990"/>
             <field name="property_account_expense_opening" ref="ch_2990"/>
-            <field name="property_reserve_and_surplus_account" ref="ch_2991"/>
             <field name="code_digits" eval="0"/>
             <field name="spoken_languages" eval="'it_IT;de_DE'"/>
             <field name="currency_id" ref="base.CHF"/>

diff --git a/l10n_es/taxes_data_assoc.xml b/l10n_es/taxes_data_assoc.xml
@@ -44,7 +44,6 @@
     <!-- Exentas IVA -->
         <record id="base_assoc_sop_ex" model="account.tax.code.template">
             <field name="name">Base adquisiciones exentas</field>
-            <field name="company_id" model="res.company"  search="[]"/>
             <field name="parent_id" ref="vat_code_chart_assoc_root"/>
             <field name="code">--</field>
             <field name="sign">1.0</field>
@@ -53,7 +52,6 @@
         <record id="base_assoc_rep_ex" model="account.tax.code.template">
             <field name="name">Base ventas exentas</field>
             <field name="code">--</field>
-            <field name="company_id" model="res.company"  search="[]"/>
             <field name="parent_id" ref="vat_code_chart_assoc_root"/>
             <field name="sign">1.0</field>
         </record>             

diff --git a/l10n_fr/fr_tax.xml b/l10n_fr/fr_tax.xml
@@ -219,8 +219,8 @@
       <field name="tax_code_id" ref="tax_acq_196"/>
       <field name="tax_sign" eval="-1"/>
 
-      <field name="account_collected_id" ref="pcg_445662"/>
-      <field name="account_paid_id" ref="pcg_445662"/>
+      <field name="account_collected_id" ref="pcg_44566"/>
+      <field name="account_paid_id" ref="pcg_44566"/>
 
       <field name="ref_base_code_id" ref="tax_acq_196_ht"/>
       <field name="ref_base_sign" eval="1"/>

diff --git a/l10n_mx/data/account_chart.xml b/l10n_mx/data/account_chart.xml
@@ -3693,8 +3693,6 @@ Cuentas del plan
         <field name="property_account_payable" ref="cuenta2122001000"/>
         <field name="property_account_expense_categ" ref="cuenta6111001000"/>
         <field name="property_account_income_categ" ref="cuenta5111001000"/>
-        <field name="property_stock_account_input_categ" ref="cuenta4111003000"/>
-        <field name="property_stock_account_output_categ" ref="cuenta4511003000"/>
         <field name="currency_id" ref="base.MXN"/>
 	</record>
 

diff --git a/l10n_pt/account_chart_template.xml b/l10n_pt/account_chart_template.xml
@@ -15,7 +15,6 @@
         <field name="property_account_income" ref="chart_711"/>
         <field name="property_account_income_categ" ref="chart_711"/>
         <field name="property_account_expense_categ" ref="chart_311"/>
-        <field name="property_reserve_and_surplus_account" ref="chart_811"/>
         <field name="currency_id" ref="base.EUR"/>
     </record>