odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] remove warnings 

bzr revid: chs@openerp.com-20131120161051-pk7n0itjcxx06uwm
This commit is contained in:
Christophe Simonis 2013-11-20 17:10:51 +01:00
parent 2941a64cee 57a4125a53
commit 82da5541e2
25 changed files with 89 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/account/data/account_data.xml
View File

@ -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"/>

1
addons/account/report/account_balance.rml
View File

@ -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"/>

10
addons/account_budget/report/analytic_account_budget_report.rml
View File

@ -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>

10
addons/account_budget/report/budget_report.rml
View File

@ -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>

10
addons/account_budget/report/crossovered_budget_report.rml
View File

@ -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>

2
addons/account_followup/account_followup_data.xml
View File

@ -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,

1
addons/base_action_rule/security/ir.model.access.csv
View File

@ -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

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_base_action_rule base.action.rule model_base_action_rule 1 0 0 0
3 access_base_action_rule_config base.action.rule config model_base_action_rule base.group_system 1 1 1 1
4 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

1
addons/document/security/ir.model.access.csv
View File

@ -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

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
15 access_report_document_file_group_document_manager report.document.file document manager model_report_document_file base.group_system 1 0 0 0
16 access_report_document_file_group_document report.document.file document manager model_report_document_file base.group_document_user 1 0 0 0
17 access_report_document_user_knowledgeuser report.document.user knowledgeuser document.model_report_document_user base.group_document_user 1 0 0 0
18 access_document_storage access_document_storage model_document_storage base.group_system 1 1 1 1

1
addons/l10n_be/__openerp__.py
View File

@ -65,6 +65,7 @@ Wizards provided by this module:
'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',

1
addons/l10n_be/account_chart_template.xml
View File

@ -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'"/>
</record>
<record id="l10nbe_chart_template_value" model="ir.values">
<field name="name">Belgian PCMN</field>

4
addons/l10n_be/account_chart_template.yml Normal file
View File

@ -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'})

3
addons/l10n_ch/sterchi_chart/account.xml
View File

@ -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'"/>
</record>

2
addons/l10n_es/taxes_data_assoc.xml
View File

@ -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>

2
addons/l10n_mx/data/account_chart.xml
View File

@ -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"/>
</record>
<record id="vauxoo_mx_chart_template_value" model="ir.values">
<field name="name">Plan de Cuentas para Mexico</field>

1
addons/l10n_pt/account_chart_template.xml
View File

@ -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"/>
</record>
<record id="pt_chart_template_value" model="ir.values">
<field name="name">Portugal - Template do Plano de Contas SNC</field>

9
addons/l10n_us/account_chart_template.xml
View File

@ -6,7 +6,6 @@
<field name="name">Basic Chart of Account</field>
<field name="visible" eval="False" />
<field name="complete_tax_set" eval="False" />
<field name="currency_id" ref="base.USD"/>
</record>
<record id="account_chart_template_basic_value" model="ir.values">
<field name="name">Basic Chart of Account</field>
@ -20,7 +19,6 @@
<field name="name">Cost of Goods sold</field>
<field name="visible" eval="False" />
<field name="parent_id" ref="account_chart_template_basic"/>
<field name="currency_id" ref="base.USD"/>
<field name="complete_tax_set" eval="False" />
</record>
<record id="account_chart_template_cogs_value" model="ir.values">
@ -34,7 +32,6 @@
<record id="account_chart_template_advertising" model="account.chart.template">
<field name="name">Advertising</field>
<field name="complete_tax_set" eval="False" />
<field name="currency_id" ref="base.USD"/>
<field name="parent_id" ref="account_chart_template_cogs"/>
</record>
<record id="account_chart_template_advertising_value" model="ir.values">
@ -48,7 +45,6 @@
<record id="account_chart_template_agriculture" model="account.chart.template">
<field name="name">Agriculture</field>
<field name="complete_tax_set" eval="False" />
<field name="currency_id" ref="base.USD"/>
<field name="parent_id" ref="account_chart_template_basic"/>
</record>
<record id="account_chart_template_agriculture_value" model="ir.values">
@ -62,7 +58,6 @@
<record id="account_chart_template_construction" model="account.chart.template">
<field name="name">Construction Trades (Plumber, Electrician, HVAC, etc.)</field>
<field name="complete_tax_set" eval="False" />
<field name="currency_id" ref="base.USD"/>
<field name="parent_id" ref="account_chart_template_cogs"/>
</record>
<record id="account_chart_template_construction_value" model="ir.values">
@ -76,7 +71,6 @@
<record id="account_chart_template_financial_service" model="account.chart.template">
<field name="name">Financial Services other than Accounting or Bookkeeping</field>
<field name="complete_tax_set" eval="False" />
<field name="currency_id" ref="base.USD"/>
<field name="parent_id" ref="account_chart_template_cogs"/>
</record>
<record id="account_chart_template_financial_service_value" model="ir.values">
@ -90,7 +84,6 @@
<record id="account_chart_template_general_service" model="account.chart.template">
<field name="name">General Service-Based Business</field>
<field name="complete_tax_set" eval="False" />
<field name="currency_id" ref="base.USD"/>
<field name="parent_id" ref="account_chart_template_cogs"/>
</record>
<record id="account_chart_template_general_service_value" model="ir.values">
@ -104,7 +97,6 @@
<record id="account_chart_template_legal_service" model="account.chart.template">
<field name="name">Legal Services</field>
<field name="complete_tax_set" eval="False" />
<field name="currency_id" ref="base.USD"/>
<field name="parent_id" ref="account_chart_template_basic"/>
</record>
<record id="account_chart_template_legal_service_value" model="ir.values">
@ -118,7 +110,6 @@
<record id="account_chart_template_general_product" model="account.chart.template">
<field name="name">General Product-Based Business</field>
<field name="complete_tax_set" eval="False" />
<field name="currency_id" ref="base.USD"/>
<field name="parent_id" ref="account_chart_template_basic"/>
</record>
<record id="account_chart_template_general_product_value" model="ir.values">

28
addons/l10n_ve/data/account_tax.xml
View File

@ -7,8 +7,8 @@
<field name="amount">0.00000</field>
<field name="type">percent</field>
<field name="type_tax_use">all</field>
<field name="collected_id" ref="account_activa_account_2172003"/>
<field name="paid_id" ref="account_activa_account_2172003"/>
<field name="account_collected_id" ref="account_activa_account_2172003"/>
<field name="account_paid_id" ref="account_activa_account_2172003"/>
<field name="base_code_id" ref="vat_code_base_due"/>
<field name="tax_code_id" ref="vat_code_due_tva"/>
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
@ -21,8 +21,8 @@
<field name="amount">0.120000</field>
<field name="type">percent</field>
<field name="type_tax_use">sale</field>
<field name="collected_id" ref="account_activa_account_2172003"/>
<field name="paid_id" ref="account_activa_account_2172003"/>
<field name="account_collected_id" ref="account_activa_account_2172003"/>
<field name="account_paid_id" ref="account_activa_account_2172003"/>
<field name="base_code_id" ref="vat_code_base_due"/>
<field name="tax_code_id" ref="vat_code_due_tva"/>
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
@ -34,8 +34,8 @@
<field name="amount">0.080000</field>
<field name="type">percent</field>
<field name="type_tax_use">sale</field>
<field name="collected_id" ref="account_activa_account_2172003"/>
<field name="paid_id" ref="account_activa_account_2172003"/>
<field name="account_collected_id" ref="account_activa_account_2172003"/>
<field name="account_paid_id" ref="account_activa_account_2172003"/>
<field name="base_code_id" ref="vat_code_base_due"/>
<field name="tax_code_id" ref="vat_code_due_tva"/>
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
@ -47,8 +47,8 @@
<field name="amount">0.220000</field>
<field name="type">percent</field>
<field name="type_tax_use">sale</field>
<field name="collected_id" ref="account_activa_account_2172003"/>
<field name="paid_id" ref="account_activa_account_2172003"/>
<field name="account_collected_id" ref="account_activa_account_2172003"/>
<field name="account_paid_id" ref="account_activa_account_2172003"/>
<field name="base_code_id" ref="vat_code_base_due"/>
<field name="tax_code_id" ref="vat_code_due_tva"/>
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
@ -60,8 +60,8 @@
<field name="amount">0.120000</field>
<field name="type">percent</field>
<field name="type_tax_use">purchase</field>
<field name="collected_id" ref="account_activa_account_1151004"/>
<field name="paid_id" ref="account_activa_account_1151004"/>
<field name="account_collected_id" ref="account_activa_account_1151004"/>
<field name="account_paid_id" ref="account_activa_account_1151004"/>
<field name="base_code_id" ref="vat_code_base_due"/>
<field name="tax_code_id" ref="vat_code_due_tva"/>
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
@ -73,8 +73,8 @@
<field name="amount">0.080000</field>
<field name="type">percent</field>
<field name="type_tax_use">purchase</field>
<field name="collected_id" ref="account_activa_account_1151004"/>
<field name="paid_id" ref="account_activa_account_1151004"/>
<field name="account_collected_id" ref="account_activa_account_1151004"/>
<field name="account_paid_id" ref="account_activa_account_1151004"/>
<field name="base_code_id" ref="vat_code_base_due"/>
<field name="tax_code_id" ref="vat_code_due_tva"/>
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
@ -86,8 +86,8 @@
<field name="amount">0.220000</field>
<field name="type">percent</field>
<field name="type_tax_use">purchase</field>
<field name="collected_id" ref="account_activa_account_1151004"/>
<field name="paid_id" ref="account_activa_account_1151004"/>
<field name="account_collected_id" ref="account_activa_account_1151004"/>
<field name="account_paid_id" ref="account_activa_account_1151004"/>
<field name="base_code_id" ref="vat_code_base_due"/>
<field name="tax_code_id" ref="vat_code_due_tva"/>
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>

4
addons/sale/test/edi_sale_order.yml
View File

@ -170,7 +170,6 @@
"__import_module": "sale",
"__import_model": "sale.order.line",
"name": "Basic PC",
"date_planned": "2011-09-30",
"price_unit": 150.0,
"product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_pc1", "[PC1] Basic PC"],
"product_qty": 1.0,
@ -183,7 +182,6 @@
"__import_module": "sale",
"__import_model": "sale.order.line",
"name": "Medium PC",
"date_planned": "2011-09-15",
"price_unit": 100.0,
"product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_pc3", "[PC3] Medium PC"],
"product_qty": 2.0,
@ -214,4 +212,4 @@
assert sale_line.price_unit == 100 , "unit price is not same, got %s, expected 100"%(sale_line.price_unit,)
assert sale_line.product_uom_qty == 2 , "product qty is not same"
else:
raise AssertionError('unknown order line: %s' % sale_line)
raise AssertionError('unknown order line: %s' % sale_line)

1
addons/sale_stock/sale_stock.py
View File

@ -306,7 +306,6 @@ class sale_order(osv.osv):
'move_id': move_id,
'company_id': order.company_id.id,
'note': line.name,
'property_ids': [(6, 0, [x.id for x in line.property_ids])],
}
def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None):

21
addons/stock/stock.py
View File

@ -1720,7 +1720,8 @@ class stock_move(osv.osv):
if location_xml_id:
try:
location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id)
self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
with tools.mute_logger('openerp.osv.orm'):
self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
except (orm.except_orm, ValueError):
location_id = False
@ -1754,7 +1755,8 @@ class stock_move(osv.osv):
if location_xml_id:
try:
location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id)
self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
with tools.mute_logger('openerp.osv.orm'):
self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
except (orm.except_orm, ValueError):
location_id = False
@ -1978,12 +1980,14 @@ class stock_move(osv.osv):
location_dest_id = 'stock_location_customers'
try:
source_location = mod_obj.get_object_reference(cr, uid, 'stock', location_source_id)
self.pool.get('stock.location').check_access_rule(cr, uid, [source_location[1]], 'read', context=context)
with tools.mute_logger('openerp.osv.orm'):
self.pool.get('stock.location').check_access_rule(cr, uid, [source_location[1]], 'read', context=context)
except (orm.except_orm, ValueError):
source_location = False
try:
dest_location = mod_obj.get_object_reference(cr, uid, 'stock', location_dest_id)
self.pool.get('stock.location').check_access_rule(cr, uid, [dest_location[1]], 'read', context=context)
with tools.mute_logger('openerp.osv.orm'):
self.pool.get('stock.location').check_access_rule(cr, uid, [dest_location[1]], 'read', context=context)
except (orm.except_orm, ValueError):
dest_location = False
return {'value':{'location_id': source_location and source_location[1] or False, 'location_dest_id': dest_location and dest_location[1] or False}}
@ -2925,7 +2929,8 @@ class stock_inventory_line(osv.osv):
def _default_stock_location(self, cr, uid, context=None):
try:
location_model, location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock')
self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
with tools.mute_logger('openerp.osv.orm'):
self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
except (orm.except_orm, ValueError):
location_id = False
return location_id
@ -2969,7 +2974,8 @@ class stock_warehouse(osv.osv):
def _default_lot_input_stock_id(self, cr, uid, context=None):
try:
lot_input_stock_model, lot_input_stock_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock')
self.pool.get('stock.location').check_access_rule(cr, uid, [lot_input_stock_id], 'read', context=context)
with tools.mute_logger('openerp.osv.orm'):
self.pool.get('stock.location').check_access_rule(cr, uid, [lot_input_stock_id], 'read', context=context)
except (ValueError, orm.except_orm):
# the user does not have read access on the location or it does not exists
lot_input_stock_id = False
@ -2978,7 +2984,8 @@ class stock_warehouse(osv.osv):
def _default_lot_output_id(self, cr, uid, context=None):
try:
lot_output_model, lot_output_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_output')
self.pool.get('stock.location').check_access_rule(cr, uid, [lot_output_id], 'read', context=context)
with tools.mute_logger('openerp.osv.orm'):
self.pool.get('stock.location').check_access_rule(cr, uid, [lot_output_id], 'read', context=context)
except (ValueError, orm.except_orm):
# the user does not have read access on the location or it does not exists
lot_output_id = False

8
addons/stock/tests/test_multicompany.py
View File

@ -56,7 +56,7 @@ class TestStockMulticompany(common.TransactionCase):
try:
self.stock_location.check_access_rule(cr, uid, [defaults[field]], 'read', context)
except Exception, exc:
assert False, "unreadable location %s: %s" % (field, exc)
self.fail("unreadable location %s: %s" % (field, exc))
self.assertEqual(defaults['type'], type, "wrong move type")
@ -71,7 +71,7 @@ class TestStockMulticompany(common.TransactionCase):
try:
self.stock_location.check_access_rule(cr, uid, [result[field]], 'read', context)
except Exception, exc:
assert False, "unreadable location %s: %s" % (field, exc)
self.fail("unreadable location %s: %s" % (field, exc))
def test_20_multicompany_default_stock_fill_inventory(self):
@ -82,7 +82,7 @@ class TestStockMulticompany(common.TransactionCase):
try:
self.stock_location.check_access_rule(cr, uid, [defaults['location_id']], 'read', context)
except Exception, exc:
assert False, "unreadable source location: %s" % exc
self.fail("unreadable source location: %s" % exc)
def test_30_multicompany_default_warehouse_location(self):
@ -95,4 +95,4 @@ class TestStockMulticompany(common.TransactionCase):
try:
self.stock_location.check_access_rule(cr, uid, [defaults[field]], 'read', context)
except Exception, exc:
assert False, "unreadable default %s: %s" % (field, exc)
self.fail("unreadable default %s: %s" % (field, exc))

4
addons/stock/wizard/stock_fill_inventory.py
View File

@ -21,6 +21,7 @@
from openerp.osv import fields, osv, orm
from openerp.tools.translate import _
from openerp.tools import mute_logger
class stock_fill_inventory(osv.osv_memory):
_name = "stock.fill.inventory"
@ -29,7 +30,8 @@ class stock_fill_inventory(osv.osv_memory):
def _default_location(self, cr, uid, ids, context=None):
try:
location = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock')
location.check_access_rule('read', context=context)
with mute_logger('openerp.osv.orm'):
location.check_access_rule('read', context=context)
location_id = location.id
except (ValueError, orm.except_orm), e:
return False

20
addons/survey/report/survey_analysis_report.py
View File

@ -94,20 +94,20 @@ class survey_analysis(report_rml):
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="answer_right" alignment="RIGHT" fontName="helvetica" fontSize="09.0" leftIndent="2.0"/>
<paraStyle name="Standard1" fontName="helvetica-bold" alignment="RIGHT" fontSize="09.0"/>
<paraStyle name="answer_right" alignment="RIGHT" fontName="Helvetica" fontSize="09.0" leftIndent="2.0"/>
<paraStyle name="Standard1" fontName="Helvetica-Bold" alignment="RIGHT" fontSize="09.0"/>
<paraStyle name="Standard" alignment="LEFT" fontName="Helvetica-Bold" fontSize="11.0"/>
<paraStyle name="header1" fontName="Helvetica" fontSize="11.0"/>
<paraStyle name="response" fontName="Helvetica-oblique" fontSize="9.5"/>
<paraStyle name="response-bold" fontName="Helvetica-bold" fontSize="9" alignment="RIGHT" />
<paraStyle name="page" fontName="helvetica" fontSize="11.0" leftIndent="0.0"/>
<paraStyle name="question" fontName="helvetica-boldoblique" fontSize="10.0" leftIndent="3.0"/>
<paraStyle name="response" fontName="Helvetica-Oblique" fontSize="9.5"/>
<paraStyle name="response-bold" fontName="Helvetica-Bold" fontSize="9" alignment="RIGHT" />
<paraStyle name="page" fontName="Helvetica" fontSize="11.0" leftIndent="0.0"/>
<paraStyle name="question" fontName="Helvetica-BoldOblique" fontSize="10.0" leftIndent="3.0"/>
<paraStyle name="answer_bold" fontName="Helvetica-Bold" fontSize="09.0" leftIndent="2.0"/>
<paraStyle name="answer" fontName="helvetica" fontSize="09.0" leftIndent="2.0"/>
<paraStyle name="Title" fontName="helvetica" fontSize="20.0" leading="15" spaceBefore="6.0" spaceAfter="6.0" alignment="CENTER"/>
<paraStyle name="answer" fontName="Helvetica" fontSize="09.0" leftIndent="2.0"/>
<paraStyle name="title" fontName="Helvetica" fontSize="20.0" leading="15" spaceBefore="6.0" spaceAfter="6.0" alignment="CENTER"/>
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="9.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Center_heading" fontName="Helvetica-bold" fontSize="9.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Center_heading" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P2" fontName="Helvetica" fontSize="14.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
</stylesheet>
<images/>
@ -118,7 +118,7 @@ class survey_analysis(report_rml):
for survey in surv_obj.browse(cr, uid, ids):
rml += """<story>
<para style="Title">Answers Summary</para>
<para style="title">Answers Summary</para>
<para style="Standard"><font></font></para>
<para style="P2">
<font color="white"> </font>

24
addons/survey/report/survey_browse_response.py
View File

@ -161,18 +161,18 @@ class survey_browse_response(report_rml):
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="title" fontName="helvetica-bold" fontSize="18.0" leftIndent="0.0" textColor="white"/>
<paraStyle name="answer_right" alignment="RIGHT" fontName="helvetica" fontSize="09.0" leftIndent="2.0"/>
<paraStyle name="Standard1" fontName="helvetica-bold" alignment="RIGHT" fontSize="09.0"/>
<paraStyle name="title" fontName="Helvetica-Bold" fontSize="18.0" leftIndent="0.0" textColor="white"/>
<paraStyle name="answer_right" alignment="RIGHT" fontName="Helvetica" fontSize="09.0" leftIndent="2.0"/>
<paraStyle name="Standard1" fontName="Helvetica-Bold" alignment="RIGHT" fontSize="09.0"/>
<paraStyle name="Standard" alignment="LEFT" fontName="Helvetica-Bold" fontSize="11.0"/>
<paraStyle name="header1" fontName="Helvetica" fontSize="11.0"/>
<paraStyle name="response" fontName="Helvetica-oblique" fontSize="9.5"/>
<paraStyle name="page" fontName="helvetica" fontSize="11.0" leftIndent="0.0"/>
<paraStyle name="question" fontName="helvetica-boldoblique" fontSize="10.0" leftIndent="3.0"/>
<paraStyle name="answer_bold" fontName="Helvetica-Bold" fontSize="09.0" leftIndent="2.0"/>
<paraStyle name="answer" fontName="helvetica" fontSize="09.0" leftIndent="2.0"/>
<paraStyle name="answer1" fontName="helvetica" fontSize="09.0" leftIndent="2.0"/>
<paraStyle name="Title" fontName="helvetica" fontSize="20.0" leading="15" spaceBefore="6.0" spaceAfter="6.0" alignment="CENTER"/>
<paraStyle name="response" fontName="Helvetica-Oblique" fontSize="9.5"/>
<paraStyle name="page" fontName="Helvetica" fontSize="11.0" leftIndent="0.0"/>
<paraStyle name="question" fontName="Helvetica-BoldOblique" fontSize="10.0" leftIndent="3.0"/>
<paraStyle name="answer_Bold" fontName="Helvetica-Bold" fontSize="09.0" leftIndent="2.0"/>
<paraStyle name="answer" fontName="Helvetica" fontSize="09.0" leftIndent="2.0"/>
<paraStyle name="answer1" fontName="Helvetica" fontSize="09.0" leftIndent="2.0"/>
<paraStyle name="Title" fontName="Helvetica" fontSize="20.0" leading="15" spaceBefore="6.0" spaceAfter="6.0" alignment="CENTER"/>
<paraStyle name="P2" fontName="Helvetica" fontSize="14.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="comment" fontName="Helvetica" fontSize="14.0" leading="50" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="12" spaceBefore="0.0" spaceAfter="1.0"/>
@ -183,8 +183,8 @@ class survey_browse_response(report_rml):
<paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="10.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_right_simple" fontName="Helvetica" fontSize="10.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="terp_tblheader_General_right" fontName="Helvetica-Bold" fontSize="10.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="descriptive_text" fontName="helvetica-bold" fontSize="18.0" leftIndent="0.0" textColor="white"/>
<paraStyle name="descriptive_text_heading" fontName="helvetica-bold" fontSize="18.0" alignment="RIGHT" leftIndent="0.0" textColor="white"/>
<paraStyle name="descriptive_text" fontName="Helvetica-Bold" fontSize="18.0" leftIndent="0.0" textColor="white"/>
<paraStyle name="descriptive_text_heading" fontName="Helvetica-Bold" fontSize="18.0" alignment="RIGHT" leftIndent="0.0" textColor="white"/>
</stylesheet>
<images/>
<story>"""

14
addons/survey/report/survey_form.py
View File

@ -132,13 +132,13 @@ class survey_form(report_rml):
<initialize>
<paraStyle name="all" alignment="justify"/>
</initialize>
<paraStyle name="response" fontName="Helvetica-oblique" fontSize="9.5"/>
<paraStyle name="page" fontName="helvetica-bold" fontSize="15.0" leftIndent="0.0" textColor="white"/>
<paraStyle name="title" fontName="helvetica-bold" fontSize="18.0" leading="15" leftIndent="0.0" textColor="white"/>
<paraStyle name="question" fontName="helvetica-boldoblique" fontSize="10.0" leftIndent="3.0"/>
<paraStyle name="answer" fontName="helvetica" fontSize="09.0" leftIndent="0.0"/>
<paraStyle name="descriptive_text" fontName="helvetica" fontSize="10.0" leftIndent="0.0"/>
<paraStyle name="answer_left" alignment="LEFT" fontName="helvetica-bold" fontSize="8.0" leftIndent="0.0"/>
<paraStyle name="response" fontName="Helvetica-Oblique" fontSize="9.5"/>
<paraStyle name="page" fontName="Helvetica-Bold" fontSize="15.0" leftIndent="0.0" textColor="white"/>
<paraStyle name="title" fontName="Helvetica-Bold" fontSize="18.0" leading="15" leftIndent="0.0" textColor="white"/>
<paraStyle name="question" fontName="Helvetica-BoldOblique" fontSize="10.0" leftIndent="3.0"/>
<paraStyle name="answer" fontName="Helvetica" fontSize="09.0" leftIndent="0.0"/>
<paraStyle name="descriptive_text" fontName="Helvetica" fontSize="10.0" leftIndent="0.0"/>
<paraStyle name="answer_left" alignment="LEFT" fontName="Helvetica-Bold" fontSize="8.0" leftIndent="0.0"/>
<paraStyle name="P2" fontName="Helvetica" fontSize="14.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
<paraStyle name="comment" fontName="Helvetica" fontSize="14.0" leading="50" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="12" spaceBefore="0.0" spaceAfter="1.0"/>