Skip to content

Commit

Permalink
[MERGE] forward port branch 9.0 up to 9bba7fe
Browse files Browse the repository at this point in the history
  • Loading branch information
@qdp-odoo
qdp-odoo committed Dec 15, 2017
2 parents 601bf82 + 9bba7fe commit 78ae6f4
Show file tree
Hide file tree
Showing 3 changed files with 240 additions and 2 deletions.
32 changes: 30 additions & 2 deletions addons/l10n_ch/data/account_fiscal_position_data.xml
View file
Expand Up @@ -19,6 +19,16 @@
<field name="tax_dest_id" ref="vat_O_import" />
</record>

<record id="fiscal_position_tax_template_5" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import" />
<field name="tax_src_id" ref="vat_37_purchase" />
<field name="tax_dest_id" ref="vat_O_import" />
</record>
<record id="fiscal_position_tax_template_6" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import" />
<field name="tax_src_id" ref="vat_37_invest" />
<field name="tax_dest_id" ref="vat_O_import" />
</record>
<record id="fiscal_position_tax_template_7" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import" />
<field name="tax_src_id" ref="vat_38_purchase" />
Expand All @@ -29,6 +39,16 @@
<field name="tax_src_id" ref="vat_38_invest" />
<field name="tax_dest_id" ref="vat_O_import" />
</record>
<record id="fiscal_position_tax_template_9" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import" />
<field name="tax_src_id" ref="vat_77_purchase" />
<field name="tax_dest_id" ref="vat_O_import" />
</record>
<record id="fiscal_position_tax_template_10" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import" />
<field name="tax_src_id" ref="vat_77_invest" />
<field name="tax_dest_id" ref="vat_O_import" />
</record>

<record id="fiscal_position_tax_template_11" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import" />
Expand All @@ -46,13 +66,21 @@
<field name="tax_src_id" ref="vat_25" />
<field name="tax_dest_id" ref="vat_XO" />
</record>

<record id="fiscal_position_tax_template_15" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import" />
<field name="tax_src_id" ref="vat_37" />
<field name="tax_dest_id" ref="vat_XO" />
</record>
<record id="fiscal_position_tax_template_16" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import" />
<field name="tax_src_id" ref="vat_38" />
<field name="tax_dest_id" ref="vat_XO" />
</record>

<record id="fiscal_position_tax_template_17" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import" />
<field name="tax_src_id" ref="vat_77" />
<field name="tax_dest_id" ref="vat_XO" />
</record>
<record id="fiscal_position_tax_template_18" model="account.fiscal.position.tax.template">
<field name="position_id" ref="fiscal_position_template_import" />
<field name="tax_src_id" ref="vat_80" />
Expand Down
159 changes: 159 additions & 0 deletions addons/l10n_ch/data/account_vat2011_data.xml
View file
Expand Up @@ -32,6 +32,10 @@
<field name="name">Switzerland VAT Form: grid 301 base</field>
<field name="applicability">taxes</field>
</record>
<record id="vat_tag_302_a" model="account.account.tag">
<field name="name">Switzerland VAT Form: grid 302 base</field>
<field name="applicability">taxes</field>
</record>
<record id="vat_tag_311_a" model="account.account.tag">
<field name="name">Switzerland VAT Form: grid 311 base</field>
<field name="applicability">taxes</field>
Expand All @@ -40,6 +44,10 @@
<field name="name">Switzerland VAT Form: grid 341 base</field>
<field name="applicability">taxes</field>
</record>
<record id="vat_tag_342_a" model="account.account.tag">
<field name="name">Switzerland VAT Form: grid 342 base</field>
<field name="applicability">taxes</field>
</record>
<record id="vat_tag_381_a" model="account.account.tag">
<field name="name">Switzerland VAT Form: grid 381 base</field>
<field name="applicability">taxes</field>
Expand All @@ -48,6 +56,10 @@
<field name="name">Switzerland VAT Form: grid 301 tax</field>
<field name="applicability">taxes</field>
</record>
<record id="vat_tag_302_b" model="account.account.tag">
<field name="name">Switzerland VAT Form: grid 302 tax</field>
<field name="applicability">taxes</field>
</record>
<record id="vat_tag_311_b" model="account.account.tag">
<field name="name">Switzerland VAT Form: grid 311 tax</field>
<field name="applicability">taxes</field>
Expand All @@ -56,6 +68,10 @@
<field name="name">Switzerland VAT Form: grid 341 tax</field>
<field name="applicability">taxes</field>
</record>
<record id="vat_tag_342_b" model="account.account.tag">
<field name="name">Switzerland VAT Form: grid 342 tax</field>
<field name="applicability">taxes</field>
</record>
<record id="vat_tag_381_b" model="account.account.tag">
<field name="name">Switzerland VAT Form: grid 381 tax</field>
<field name="applicability">taxes</field>
Expand Down Expand Up @@ -160,6 +176,75 @@
<field name="tag_ids" eval="[(6,0,[ref('vat_tag_405')])]"/>
</record>

<record model="account.tax.template" id="vat_37">
<field name="name">TVA due a 3.7% (TS)</field>
<field name="description">3.7%</field>
<field name="amount" eval="3.7"/>
<field name="amount_type">percent</field>
<field name="chart_template_id" ref="l10nch_chart_template"/>
<field name="type_tax_use">sale</field>
<field name="refund_account_id" ref="ch_coa_2200"/>
<field name="account_id" ref="ch_coa_2200"/>
<field name="tag_ids" eval="[(6,0,[ref('vat_tag_342_a'), ref('vat_tag_342_b')])]"/>
</record>
<record model="account.tax.template" id="vat_37_incl">
<field name="name">TVA due à 3.7% (Incl. TS)</field>
<field name="description">3.7% Incl.</field>
<field name="price_include" eval="1"/>
<field name="amount" eval="3.7"/>
<field name="amount_type">percent</field>
<field name="chart_template_id" ref="l10nch_chart_template"/>
<field name="type_tax_use">sale</field>
<field name="refund_account_id" ref="ch_coa_2200"/>
<field name="account_id" ref="ch_coa_2200"/>
<field name="tag_ids" eval="[(6,0,[ref('vat_tag_342_a'), ref('vat_tag_342_b')])]"/>
</record>
<record model="account.tax.template" id="vat_37_purchase">
<field name="name">TVA 3.7% sur achat B&amp;S (TS)</field>
<field name="description">3.7% achat</field>
<field name="amount" eval="3.7"/>
<field name="amount_type">percent</field>
<field name="chart_template_id" ref="l10nch_chart_template"/>
<field name="type_tax_use">purchase</field>
<field name="refund_account_id" ref="ch_coa_1170"/>
<field name="account_id" ref="ch_coa_1170"/>
<field name="tag_ids" eval="[(6,0,[ref('vat_tag_400')])]"/>
</record>
<record model="account.tax.template" id="vat_37_purchase_incl">
<field name="name">TVA 3.7% sur achat B&amp;S (Incl. TS)</field>
<field name="description">3.7% achat Incl.</field>
<field name="price_include" eval="1"/>
<field name="amount" eval="3.7"/>
<field name="amount_type">percent</field>
<field name="chart_template_id" ref="l10nch_chart_template"/>
<field name="type_tax_use">purchase</field>
<field name="refund_account_id" ref="ch_coa_1170"/>
<field name="account_id" ref="ch_coa_1170"/>
<field name="tag_ids" eval="[(6,0,[ref('vat_tag_400')])]"/>
</record>
<record model="account.tax.template" id="vat_37_invest">
<field name="name">TVA 3.7% sur invest. et autres ch. (TS)</field>
<field name="description">3.7% invest</field>
<field name="amount" eval="3.7"/>
<field name="amount_type">percent</field>
<field name="chart_template_id" ref="l10nch_chart_template"/>
<field name="type_tax_use">purchase</field>
<field name="refund_account_id" ref="ch_coa_1171"/>
<field name="account_id" ref="ch_coa_1171"/>
<field name="tag_ids" eval="[(6,0,[ref('vat_tag_405')])]"/>
</record>
<record model="account.tax.template" id="vat_37_invest_incl">
<field name="name">TVA 3.7% sur invest. et autres ch. (Incl. TS)</field>
<field name="description">3.7% invest Incl.</field>
<field name="price_include" eval="1"/>
<field name="amount" eval="3.7"/>
<field name="amount_type">percent</field>
<field name="chart_template_id" ref="l10nch_chart_template"/>
<field name="type_tax_use">purchase</field>
<field name="refund_account_id" ref="ch_coa_1171"/>
<field name="account_id" ref="ch_coa_1171"/>
<field name="tag_ids" eval="[(6,0,[ref('vat_tag_405')])]"/>
</record>
<record model="account.tax.template" id="vat_38">
<field name="name">TVA due a 3.8% (TS)</field>
<field name="description">3.8%</field>
Expand Down Expand Up @@ -229,6 +314,80 @@
<field name="account_id" ref="ch_coa_1171"/>
<field name="tag_ids" eval="[(6,0,[ref('vat_tag_405')])]"/>
</record>

<record model="account.tax.template" id="vat_77">
<field name="name">TVA due a 7.7% (TN)</field>
<field name="description">7.7%</field>
<field name="amount" eval="7.7"/>
<field name="sequence" eval="0"/>
<field name="amount_type">percent</field>
<field name="chart_template_id" ref="l10nch_chart_template"/>
<field name="type_tax_use">sale</field>
<field name="refund_account_id" ref="ch_coa_2200"/>
<field name="account_id" ref="ch_coa_2200"/>
<field name="tag_ids" eval="[(6,0,[ref('vat_tag_302_a'), ref('vat_tag_302_b')])]"/>
</record>
<record model="account.tax.template" id="vat_77_incl">
<field name="name">TVA due à 7.7% (Incl. TN)</field>
<field name="description">7.7% Incl.</field>
<field name="price_include" eval="1"/>
<field name="amount" eval="7.7"/>
<field name="sequence" eval="0"/>
<field name="amount_type">percent</field>
<field name="chart_template_id" ref="l10nch_chart_template"/>
<field name="type_tax_use">sale</field>
<field name="refund_account_id" ref="ch_coa_2200"/>
<field name="account_id" ref="ch_coa_2200"/>
<field name="tag_ids" eval="[(6,0,[ref('vat_tag_302_a'), ref('vat_tag_302_b')])]"/>
</record>
<record model="account.tax.template" id="vat_77_purchase">
<field name="name">TVA 7.7% sur achat B&amp;S (TN)</field>
<field name="description">7.7% achat</field>
<field name="amount" eval="7.7"/>
<field name="amount_type">percent</field>
<field name="sequence" eval="0"/>
<field name="chart_template_id" ref="l10nch_chart_template"/>
<field name="type_tax_use">purchase</field>
<field name="refund_account_id" ref="ch_coa_1170"/>
<field name="account_id" ref="ch_coa_1170"/>
<field name="tag_ids" eval="[(6,0,[ref('vat_tag_400')])]"/>
</record>
<record model="account.tax.template" id="vat_77_purchase_incl">
<field name="name">TVA 7.7% sur achat B&amp;S (Incl. TN)</field>
<field name="description">7.7% achat Incl.</field>
<field name="price_include" eval="1"/>
<field name="amount" eval="7.7"/>
<field name="amount_type">percent</field>
<field name="sequence" eval="0"/>
<field name="chart_template_id" ref="l10nch_chart_template"/>
<field name="type_tax_use">purchase</field>
<field name="refund_account_id" ref="ch_coa_1170"/>
<field name="account_id" ref="ch_coa_1170"/>
<field name="tag_ids" eval="[(6,0,[ref('vat_tag_400')])]"/>
</record>
<record model="account.tax.template" id="vat_77_invest">
<field name="name">TVA 7.7% sur invest. et autres ch. (TN)</field>
<field name="description">7.7% invest.</field>
<field name="amount" eval="7.7"/>
<field name="amount_type">percent</field>
<field name="chart_template_id" ref="l10nch_chart_template"/>
<field name="type_tax_use">purchase</field>
<field name="refund_account_id" ref="ch_coa_1171"/>
<field name="account_id" ref="ch_coa_1171"/>
<field name="tag_ids" eval="[(6,0,[ref('vat_tag_405')])]"/>
</record>
<record model="account.tax.template" id="vat_77_invest_incl">
<field name="name">TVA 7.7% sur invest. et autres ch. (Incl. TN)</field>
<field name="description">7.7% invest. Incl.</field>
<field name="price_include" eval="1"/>
<field name="amount" eval="7.7"/>
<field name="amount_type">percent</field>
<field name="chart_template_id" ref="l10nch_chart_template"/>
<field name="type_tax_use">purchase</field>
<field name="refund_account_id" ref="ch_coa_1171"/>
<field name="account_id" ref="ch_coa_1171"/>
<field name="tag_ids" eval="[(6,0,[ref('vat_tag_405')])]"/>
</record>
<record model="account.tax.template" id="vat_80">
<field name="name">TVA due a 8.0% (TN)</field>
<field name="description">8.0%</field>
Expand Down
51 changes: 51 additions & 0 deletions addons/web_editor/static/src/js/summernote.js
View file
Expand Up @@ -19,6 +19,57 @@ var editor = eventHandler.modules.editor;
var renderer = $.summernote.renderer;
var options = $.summernote.options;

// Browser-unify execCommand
var oldJustify = {};
_.each(['Left', 'Right', 'Full', 'Center'], function (align) {
oldJustify[align] = editor['justify' + align];
editor['justify' + align] = function ($editable, value) {
// Before calling the standard function, check all elements which have
// an 'align' attribute and mark them with their value
var $align = $editable.find('[align]');
_.each($align, function (el) {
var $el = $(el);
$el.data('__align', $el.attr('align'));
});

// Call the standard function
oldJustify[align].apply(this, arguments);

// Then:

// Remove the text-align of elements which lost the 'align' attribute
var $newAlign = $editable.find('[align]');
$align.not($newAlign).css('text-align', '');

// Transform the 'align' attribute into the 'text-align' css
// property for elements which received the 'align' attribute or whose
// 'align' attribute changed
_.each($newAlign, function (el) {
var $el = $(el);

var oldAlignValue = $align.data('__align');
var alignValue = $el.attr('align');
if (oldAlignValue === alignValue) {
// If the element already had an 'align' attribute and that it
// did not changed, do nothing (compatibility)
return;
}

$el.removeAttr('align');
$el.css('text-align', alignValue);

// Note the first step (removing the text-align of elemnts which
// lost the 'align' attribute) is kinda the same as this one, but
// this one handles the elements which have been edited with chrome
// or with this new system
$el.find('*').css('text-align', '');
});

// Unmark the elements
$align.removeData('__align');
};
});

//////////////////////////////////////////////////////////////////////////////////////////////////////////
/* Add method to Summernote*/

Expand Down

0 comments on commit 78ae6f4

Please sign in to comment.