pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 9.0 up to e318a96

Browse Source
This commit is contained in:
Christophe Simonis
2016-09-26 14:17:49 +02:00
parent 599bd5092b e318a96490
commit faaacab737
13 changed files with 223 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.tx/config
+5
View File
@@ -47,6 +47,11 @@ file_filter = addons/account_tax_cash_basis/i18n/<lang>.po
source_file = addons/account_tax_cash_basis/i18n/account_tax_cash_basis.pot
source_lang = en
[odoo-9.account_tax_exigible]
file_filter = addons/account_tax_exigible/i18n/<lang>.po
source_file = addons/account_tax_exigible/i18n/account_tax_exigible.pot
source_lang = en
[odoo-9.account_tax_python]
file_filter = addons/account_tax_python/i18n/<lang>.po
source_file = addons/account_tax_python/i18n/account_tax_python.pot
addons/account/views/report_agedpartnerbalance.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<t t-call="report.html_container">
<t t-call="report.internal_layout">
<div class="page">
<h2>Aged Trial Balance</h2>
<h2>Aged Partner Balance</h2>
<div class="row mt32">
<div class="col-xs-3">
addons/account_asset/account_asset_invoice.py
+2 -2
View File
@@ -28,8 +28,8 @@ class AccountInvoiceLine(models.Model):
_inherit = 'account.invoice.line'
asset_category_id = fields.Many2one('account.asset.category', string='Asset Category')
asset_start_date = fields.Date(string='Asset End Date', compute='_get_asset_date', readonly=True, store=True)
asset_end_date = fields.Date(string='Asset Start Date', compute='_get_asset_date', readonly=True, store=True)
asset_start_date = fields.Date(string='Asset Start Date', compute='_get_asset_date', readonly=True, store=True)
asset_end_date = fields.Date(string='Asset End Date', compute='_get_asset_date', readonly=True, store=True)
asset_mrr = fields.Float(string='Monthly Recurring Revenue', compute='_get_asset_date', readonly=True, digits=dp.get_precision('Account'), store=True)
@api.one
addons/l10n_de_skr03/account_chart.xml
+15 -15
View File
@@ -484,7 +484,7 @@
<record model="account.account.template" id="account_1120">
<field name="name">Postbank 2</field>
<field name="code">1120</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_de_chart_template"/>
</record>
@@ -708,7 +708,7 @@
<record model="account.account.template" id="account_1010">
<field name="name">Nebenkasse 1</field>
<field name="code">1010</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_de_chart_template"/>
</record>
@@ -750,14 +750,14 @@
<record model="account.account.template" id="account_1130">
<field name="name">Postbank 3</field>
<field name="code">1130</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_de_chart_template"/>
</record>
<record model="account.account.template" id="account_1230">
<field name="name">Bank 3</field>
<field name="code">1230</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_de_chart_template"/>
</record>
@@ -806,7 +806,7 @@
<record model="account.account.template" id="account_1330">
<field name="name">Schecks</field>
<field name="code">1330</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_de_chart_template"/>
</record>
@@ -925,7 +925,7 @@
<record model="account.account.template" id="account_1240">
<field name="name">Bank 4</field>
<field name="code">1240</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_de_chart_template"/>
</record>
@@ -1492,7 +1492,7 @@
<record model="account.account.template" id="account_1190">
<field name="name">LZB-Guthaben</field>
<field name="code">1190</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_de_chart_template"/>
</record>
@@ -2850,7 +2850,7 @@
<record model="account.account.template" id="account_1220">
<field name="name">Bank 2</field>
<field name="code">1220</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_de_chart_template"/>
</record>
@@ -3116,7 +3116,7 @@
<record model="account.account.template" id="account_1110">
<field name="name">Postbank 1</field>
<field name="code">1110</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_de_chart_template"/>
</record>
@@ -4019,7 +4019,7 @@
<record model="account.account.template" id="account_1020">
<field name="name">Nebenkasse 2</field>
<field name="code">1020</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_de_chart_template"/>
</record>
@@ -4796,7 +4796,7 @@
<record model="account.account.template" id="account_1210">
<field name="name">Bank 1</field>
<field name="code">1210</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_de_chart_template"/>
</record>
@@ -5020,7 +5020,7 @@
<record model="account.account.template" id="account_1100">
<field name="name">Postbank</field>
<field name="code">1100</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_de_chart_template"/>
</record>
@@ -6161,7 +6161,7 @@
<record model="account.account.template" id="account_1250">
<field name="name">Bank 5</field>
<field name="code">1250</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_de_chart_template"/>
</record>
@@ -6511,7 +6511,7 @@
<record model="account.account.template" id="account_1195">
<field name="name">Bundesbankguthaben</field>
<field name="code">1195</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_de_chart_template"/>
</record>
@@ -7218,7 +7218,7 @@
<record model="account.account.template" id="account_1360">
<field name="name">Geldtransit</field>
<field name="code">1360</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_de_chart_template"/>
</record>
addons/l10n_de_skr04/account_chart.xml
+12 -12
View File
@@ -3463,7 +3463,7 @@
<record id="chart_skr04_1460" model="account.account.template">
<field name="code">1460</field>
<field name="name">Geldtransit</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
</record>
@@ -3615,7 +3615,7 @@
<record id="chart_skr04_1610" model="account.account.template">
<field name="code">1610</field>
<field name="name">Nebenkasse 1</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
</record>
@@ -3623,7 +3623,7 @@
<record id="chart_skr04_1620" model="account.account.template">
<field name="code">1620</field>
<field name="name">Nebenkasse 2</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
</record>
@@ -3631,7 +3631,7 @@
<record id="chart_skr04_1700" model="account.account.template">
<field name="code">1700</field>
<field name="name">Postbank</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
</record>
@@ -3639,7 +3639,7 @@
<record id="chart_skr04_1710" model="account.account.template">
<field name="code">1710</field>
<field name="name">Postbank 1</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
</record>
@@ -3647,7 +3647,7 @@
<record id="chart_skr04_1720" model="account.account.template">
<field name="code">1720</field>
<field name="name">Postbank 2</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
</record>
@@ -3655,7 +3655,7 @@
<record id="chart_skr04_1730" model="account.account.template">
<field name="code">1730</field>
<field name="name">Postbank 3</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
</record>
@@ -3679,7 +3679,7 @@
<record id="chart_skr04_1810" model="account.account.template">
<field name="code">1810</field>
<field name="name">Bank 1</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
</record>
@@ -3687,7 +3687,7 @@
<record id="chart_skr04_1820" model="account.account.template">
<field name="code">1820</field>
<field name="name">Bank 2</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
</record>
@@ -3695,7 +3695,7 @@
<record id="chart_skr04_1830" model="account.account.template">
<field name="code">1830</field>
<field name="name">Bank 3</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
</record>
@@ -3703,7 +3703,7 @@
<record id="chart_skr04_1840" model="account.account.template">
<field name="code">1840</field>
<field name="name">Bank 4</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
</record>
@@ -3711,7 +3711,7 @@
<record id="chart_skr04_1850" model="account.account.template">
<field name="code">1850</field>
<field name="name">Bank 5</field>
<field name="reconcile" eval="True"/>
<field name="reconcile" eval="False"/>
<field name="user_type_id" ref="account.data_account_type_current_assets"/>
<field name="chart_template_id" ref="l10n_chart_de_skr04"/>
</record>
addons/l10n_fr/fr_fiscal_templates.xml
+50
View File
@@ -39,30 +39,55 @@
<field name="tax_src_id" ref="tva_normale" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<record id="fp_tax_template_intraeub2b_vt_normale_ttc" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_normale_ttc" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<!-- Taux DOM-TOM -->
<record id="fp_tax_template_intraeub2b_vt_specifique" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_specifique" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<record id="fp_tax_template_intraeub2b_vt_specifique_ttc" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_specifique_ttc" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<!-- Taux Intermédiaire -->
<record id="fp_tax_template_intraeub2b_vt_intermediaire" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_intermediaire" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<record id="fp_tax_template_intraeub2b_vt_intermediaire_ttc" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_intermediaire_ttc" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<!-- Taux réduit -->
<record id="fp_tax_template_intraeub2b_vt_reduite" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_reduite" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<record id="fp_tax_template_intraeub2b_vt_reduite_ttc" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_reduite_ttc" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<!-- Taux super réduit -->
<record id="fp_tax_template_intraeub2b_vt_super_reduite" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_super_reduite" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<record id="fp_tax_template_intraeub2b_vt_super_reduite_ttc" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_intraeub2b" />
<field name="tax_src_id" ref="tva_super_reduite_ttc" />
<field name="tax_dest_id" ref="tva_intra_0" />
</record>
<!-- achats -->
<!-- Taux Normal -->
<record id="fp_tax_template_intraeub2b_ha_normale_deduc" model="account.fiscal.position.tax.template">
@@ -128,30 +153,55 @@
<field name="tax_src_id" ref="tva_normale" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<record id="fp_tax_template_impexp_vt_normale_ttc" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_normale_ttc" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<!-- Taux DOM-TOM -->
<record id="fp_tax_template_impexp_vt_specifique" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_specifique" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<record id="fp_tax_template_impexp_vt_specifique_ttc" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_specifique_ttc" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<!-- Taux Intermédiare -->
<record id="fp_tax_template_impexp_vt_intermediaire" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_intermediaire" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<record id="fp_tax_template_impexp_vt_intermediaire_ttc" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_intermediaire_ttc" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<!-- Taux Réduit -->
<record id="fp_tax_template_impexp_vt_reduite" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_reduite" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<record id="fp_tax_template_impexp_vt_reduite_ttc" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_reduite_ttc" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<!-- Taux super réduit -->
<record id="fp_tax_template_impexp_vt_super_reduite" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_super_reduite" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<record id="fp_tax_template_impexp_vt_super_reduite_ttc" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import_export" />
<field name="tax_src_id" ref="tva_super_reduite_ttc" />
<field name="tax_dest_id" ref="tva_export_0" />
</record>
<!-- achats -->
<!-- Taux Normal -->
addons/l10n_fr/fr_tax.xml
+96
View File
@@ -33,6 +33,31 @@
<field name="applicability">taxes</field>
</record>
<record id="tax_20_0_TTC" model="account.account.tag">
<field name="name">20.0-TTC</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_10_0_TTC" model="account.account.tag">
<field name="name">10.0-TTC</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_8_5_TTC" model="account.account.tag">
<field name="name">8.5-TTC</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_5_5_TTC" model="account.account.tag">
<field name="name">5.5-TTC</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_2_1_TTC" model="account.account.tag">
<field name="name">2.1-TTC</field>
<field name="applicability">taxes</field>
</record>
<record id="tax_ACH-8_5" model="account.account.tag">
<field name="name">ACH-8_5</field>
<field name="applicability">taxes</field>
@@ -250,6 +275,77 @@
</record>
<!-- VENTES Tax INCLUDE (TTC) -->
<record model="account.tax.template" id="tva_normale_ttc">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA collectée (vente) 20,0% TTC</field>
<field name="description">20.0-TTC</field>
<field name="price_include" eval="1"/>
<field name="amount" eval="20.0"/>
<field name="amount_type">percent</field>
<field name="refund_account_id" ref="pcg_445711"/>
<field name="account_id" ref="pcg_445711"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">sale</field>
<field name="tag_ids" eval="[(6,0,[ref('l10n_fr.tax_20_0_TTC')])]"/>
</record>
<record model="account.tax.template" id="tva_specifique_ttc">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA collectée (vente) 8,5% TTC</field>
<field name="description">8.5-TTC</field>
<field name="price_include" eval="1"/>
<field name="amount" eval="8.5"/>
<field name="amount_type">percent</field>
<field name="refund_account_id" ref="pcg_445713"/>
<field name="account_id" ref="pcg_445713"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">sale</field>
<field name="tag_ids" eval="[(6,0,[ref('l10n_fr.tax_8_5_TTC')])]"/>
</record>
<record model="account.tax.template" id="tva_intermediaire_ttc">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA collectée (vente) 10,0% TTC</field>
<field name="description">10.0-TTC</field>
<field name="price_include" eval="1"/>
<field name="amount" eval="10.0"/>
<field name="amount_type">percent</field>
<field name="refund_account_id" ref="pcg_445712"/>
<field name="account_id" ref="pcg_445712"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">sale</field>
<field name="tag_ids" eval="[(6,0,[ref('l10n_fr.tax_10_0_TTC')])]"/>
</record>
<record model="account.tax.template" id="tva_reduite_ttc">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA collectée (vente) 5,5% TTC</field>
<field name="description">5.5-TTC</field>
<field name="price_include" eval="1"/>
<field name="amount" eval="5.5"/>
<field name="amount_type">percent</field>
<field name="refund_account_id" ref="pcg_445713"/>
<field name="account_id" ref="pcg_445713"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">sale</field>
<field name="tag_ids" eval="[(6,0,[ref('l10n_fr.tax_5_5_TTC')])]"/>
</record>
<record model="account.tax.template" id="tva_super_reduite_ttc">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
<field name="name">TVA collectée (vente) 2,1% TTC</field>
<field name="description">2.1-TTC</field>
<field name="price_include" eval="1"/>
<field name="amount" eval="2.1"/>
<field name="amount_type">percent</field>
<field name="refund_account_id" ref="pcg_445713"/>
<field name="account_id" ref="pcg_445713"/>
<field name="sequence" eval="10"/>
<field name="type_tax_use">sale</field>
<field name="tag_ids" eval="[(6,0,[ref('l10n_fr.tax_2_1_TTC')])]"/>
</record>
<!-- ACHATS Tax excluded from price -->
<record model="account.tax.template" id="tva_acq_normale">
<field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
addons/web/static/src/js/views/form_relational_widgets.js
+1 -1
View File
@@ -974,7 +974,7 @@ var X2ManyListView = ListView.extend({
field.no_rerender = true;
current_values[field.name] = field.get('value');
});
var cached_records = _.filter(this.dataset.cache, function(item){return !_.isEmpty(item.values)});
var cached_records = _.filter(this.dataset.cache, function(item){return !_.isEmpty(item.values) && !item.to_delete;});
var valid = _.every(cached_records, function(record){
_.each(fields, function(field){
var value = record.values[field.name];
addons/website/static/src/js/website.seo.js
+2 -2
View File
@@ -343,8 +343,8 @@ var Configurator = Dialog.extend({
template: 'website.seo_configuration',
events: {
'keyup input[name=seo_page_keywords]': 'confirmKeyword',
'keyup input[name=seo_page_title]': 'titleChanged',
'keyup textarea[name=seo_page_description]': 'descriptionChanged',
'blur input[name=seo_page_title]': 'titleChanged',
'blur textarea[name=seo_page_description]': 'descriptionChanged',
'click button[data-action=add]': 'addKeyword',
},
canEditTitle: false,
doc/cla/individual/bfotop.md
+11
View File
@@ -0,0 +1,11 @@
Greece, 2016-09-23
I hereby agree to the terms of the Odoo Individual Contributor License Agreement v1.0.
I declare that I am authorized and able to make this agreement and sign this declaration.
Signed,
Basilis Fotopoulos bfotop@tax-solutions.gr https://github.com/bfotop
doc/cla/individual/kaerdsar.md
+11
View File
@@ -0,0 +1,11 @@
Cuba, 08/10/2016
I hereby agree to the terms of the Odoo Individual Contributor License
Agreement v1.0.
I declare that I am authorized and able to make this agreement and sign this
declaration.
Signed,
Cesar Lage kaerdsar@gmail.com https://github.com/kaerdsar
openerp/addons/base/ir/ir_config_parameter.py
+7 -1
View File
@@ -6,10 +6,13 @@ Store database-specific configuration parameters
import uuid
import datetime
import logging
from openerp import SUPERUSER_ID
from openerp.osv import osv, fields
from openerp.tools import misc, config, ormcache
from openerp.tools import misc, config, ormcache, mute_logger
_logger = logging.getLogger(__name__)
"""
A dictionary holding some configuration parameters to be initialized when the database is created.
@@ -38,6 +41,7 @@ class ir_config_parameter(osv.osv):
('key_uniq', 'unique (key)', 'Key must be unique.')
]
@mute_logger('openerp.addons.base.ir.ir_config_parameter')
def init(self, cr, force=False):
"""
Initializes the parameters listed in _default_parameters.
@@ -88,6 +92,8 @@ class ir_config_parameter(osv.osv):
res_id = self.pool['ir.model.data'].xmlid_to_res_id(cr, uid, group_xml)
if res_id:
gids.append((4, res_id))
else:
_logger.warning('Potential Security Issue: Group [%s] is not found.' % group_xml)
vals = {'value': value}
if gids:
openerp/tools/translate.py
+10 -6
View File
@@ -305,12 +305,16 @@ def html_translate(callback, value):
if not value:
return value
parser = etree.HTMLParser(encoding='utf-8')
trans = XMLTranslator(callback, 'html', parser)
wrapped = "<div>%s</div>" % encode(value)
root = etree.fromstring(wrapped, parser)
trans.process(root[0][0]) # html > body > div
return trans.get_done()[5:-6] # remove tags <div> and </div>
try:
parser = etree.HTMLParser(encoding='utf-8')
trans = XMLTranslator(callback, 'html', parser)
wrapped = "<div>%s</div>" % encode(value)
root = etree.fromstring(wrapped, parser)
trans.process(root[0][0]) # html > body > div
value = trans.get_done()[5:-6] # remove tags <div> and </div>
except ValueError:
_logger.exception("Cannot translate malformed HTML, using source value instead")
return value
#