Skip to content

Commit

Permalink
Merge PR #1549 into 8.0
Browse files Browse the repository at this point in the history 
Signed-off-by sergiocorato
  • Loading branch information
@OCA-git-bot
OCA-git-bot committed Jan 28, 2020
2 parents d43d875 + 1d73abf commit 98cb679
Show file tree
Hide file tree
Showing 21 changed files with 880 additions and 726 deletions.
2 changes: 1 addition & 1 deletion account_vat_period_end_statement/reports.xml
View file
Expand Up @@ -2,7 +2,7 @@
<openerp>
<data>

<report
<report
id="action_report_account_vat_period_end_statement"
model="account.vat.period.end.statement"
string="Print Vat Period End Statement"
Expand Down
40 changes: 20 additions & 20 deletions account_vat_period_end_statement/views/config.xml
View file
@@ -1,23 +1,23 @@
<?xml version="1.0" ?>
<openerp>
<data>
<record id="view_vat_period_end_statement_company_form" model="ir.ui.view">
<field name="name">view_vat_period_end_statement_company</field>
<field name="model">res.company</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">
<xpath expr="//page[@string='Configuration']/group" position="after">
<group string="Vat period end statement">
<field name="of_account_end_vat_statement_interest"/>
<field name="of_account_end_vat_statement_interest_percent"/>
<field name="of_account_end_vat_statement_interest_account_id"/>
</group>
</xpath>
</field>
</record>
</data>
<data>

<record id="view_vat_period_end_statement_company_form" model="ir.ui.view">
<field name="name">view_vat_period_end_statement_company</field>
<field name="model">res.company</field>
<field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml">

<xpath expr="//page[@string='Configuration']/group" position="after">
<group string="Vat period end statement">
<field name="of_account_end_vat_statement_interest"/>
<field name="of_account_end_vat_statement_interest_percent"/>
<field name="of_account_end_vat_statement_interest_account_id"/>
</group>
</xpath>

</field>
</record>

</data>
</openerp>
546 changes: 309 additions & 237 deletions account_vat_period_end_statement/views/report_vatperiodendstatement.xml
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions l10n_it_ateco/view/ateco_view.xml
View file
@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<openerp>
<data>
<record id="view_ateco_category_form" model="ir.ui.view">
<data>
<record id="view_ateco_category_form" model="ir.ui.view">
<field name="name">ateco.category.form</field>
<field name="model">ateco.category</field>
<field name="type">form</field>
Expand Down
55 changes: 28 additions & 27 deletions l10n_it_base_crm/crm/crm_view.xml
View file
@@ -1,33 +1,34 @@
<?xml version="1.0" ?>
<openerp>
<data>
<data>

<record model="ir.ui.view" id="view_lead_form_inherit_province">
<field name="name">lead.form.province</field>
<field name="model">crm.lead</field>
<field name="inherit_id" ref="crm.crm_case_form_view_leads"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="country_id" position="before">
<div class="province_format">
<field name="province" placeholder="Province" select="2"/>
<field name="region" placeholder="Region"/>
</div>
</field>
</field>
</record>
<record model="ir.ui.view" id="view_lead_form_inherit_province">
<field name="name">lead.form.province</field>
<field name="model">crm.lead</field>
<field name="inherit_id" ref="crm.crm_case_form_view_leads"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="country_id" position="before">
<div class="province_format">
<field name="province" placeholder="Province" select="2"/>
<field name="region" placeholder="Region"/>
</div>
</field>
</field>
</record>

<record model="ir.ui.view" id="view_lead_form_inherit_city">
<field name="name">lead.form.city</field>
<field name="model">crm.lead</field>
<field name="inherit_id" ref="crm.crm_case_form_view_leads"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="city" position="replace" >
<field name="city" placeholder="City" style="width: 70%%" on_change="on_change_city(city)"/>
</field>
</field>
</record>
<record model="ir.ui.view" id="view_lead_form_inherit_city">
<field name="name">lead.form.city</field>
<field name="model">crm.lead</field>
<field name="inherit_id" ref="crm.crm_case_form_view_leads"/>
<field name="type">form</field>
<field name="arch" type="xml">
<field name="city" position="replace">
<field name="city" placeholder="City" style="width: 70%%"
on_change="on_change_city(city)"/>
</field>
</field>
</record>

</data>
</data>
</openerp>
94 changes: 56 additions & 38 deletions l10n_it_bill_of_entry/account_invoice_view.xml
View file
Expand Up @@ -2,49 +2,67 @@
<openerp>
<data>

<record model="ir.ui.view" id="invoice_supplier_form">
<field name="name">account.invoice.supplier.form</field>
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account.invoice_supplier_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='journal_id']" position="after">
<field name="customs_doc_type" attrs="{'readonly': ['|',('state', '!=', 'draft'), ('forwarder_bill_of_entry_ids', '!=', [])]}"/>
</xpath>
<xpath expr="//notebook/page[@string='Payments']" position="after">
<page string="Customs" attrs="{'invisible': [('customs_doc_type','=', False)]}">
<separator string="Bill of entries" colspan="4" attrs="{'invisible': [('customs_doc_type','!=', 'supplier_invoice')]}"></separator>
<field name="supplier_bill_of_entry_ids" attrs="{'invisible': [('customs_doc_type','!=', 'supplier_invoice')]}" />
<separator string="Supplier invoices" colspan="4" attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}"></separator>
<field name="supplier_invoice_ids" attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}" domain="[('customs_doc_type', '=', 'supplier_invoice')]" context="{'default_customs_doc_type': 'supplier_invoice'}"/>
<record model="ir.ui.view" id="invoice_supplier_form">
<field name="name">account.invoice.supplier.form</field>
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account.invoice_supplier_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='journal_id']" position="after">
<field name="customs_doc_type"
attrs="{'readonly': ['|',('state', '!=', 'draft'), ('forwarder_bill_of_entry_ids', '!=', [])]}"/>
</xpath>
<xpath expr="//notebook/page[@string='Payments']" position="after">
<page string="Customs"
attrs="{'invisible': [('customs_doc_type','=', False)]}">
<separator string="Bill of entries" colspan="4"
attrs="{'invisible': [('customs_doc_type','!=', 'supplier_invoice')]}"></separator>
<field name="supplier_bill_of_entry_ids"
attrs="{'invisible': [('customs_doc_type','!=', 'supplier_invoice')]}"/>
<separator string="Supplier invoices" colspan="4"
attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}"></separator>
<field name="supplier_invoice_ids"
attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}"
domain="[('customs_doc_type', '=', 'supplier_invoice')]"
context="{'default_customs_doc_type': 'supplier_invoice'}"/>
<group>
<field name="forwarder_invoice_id" attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}" domain="[('customs_doc_type','=', 'forwarder_invoice')]" context="{'default_customs_doc_type': 'forwarder_invoice'}"/>
<field name="forwarder_invoice_id"
attrs="{'invisible': [('customs_doc_type','!=', 'bill_of_entry')]}"
domain="[('customs_doc_type','=', 'forwarder_invoice')]"
context="{'default_customs_doc_type': 'forwarder_invoice'}"/>
</group>
<separator string="Bill of entries" colspan="4" attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"></separator>
<field name="forwarder_bill_of_entry_ids" attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
<group>
<field name="bill_of_entry_storno_id" attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
<separator string="Bill of entries" colspan="4"
attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"></separator>
<field name="forwarder_bill_of_entry_ids"
attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
<group>
<field name="bill_of_entry_storno_id"
attrs="{'invisible': [('customs_doc_type','!=', 'forwarder_invoice')]}"/>
</group>
<button string="Make Bill of Entry" name="%(account_invoice_template.action_wizard_select_template)d" type="action" class="oe_highlight" attrs="{'invisible': ['|',('customs_doc_type','!=', 'forwarder_invoice'),('state','!=','draft')]}"/>
</page>
</xpath>
<xpath expr="//notebook/page[@string='Invoice']/field[@name='invoice_line']/tree/field[@name='price_subtotal']" position="after">
<button string="Make Bill of Entry"
name="%(account_invoice_template.action_wizard_select_template)d"
type="action" class="oe_highlight"
attrs="{'invisible': ['|',('customs_doc_type','!=', 'forwarder_invoice'),('state','!=','draft')]}"/>
</page>
</xpath>
<xpath expr="//notebook/page[@string='Invoice']/field[@name='invoice_line']/tree/field[@name='price_subtotal']"
position="after">
<!--It seems attrs doesn't work -->
<field name="advance_customs_vat"/>
</xpath>
</field>
</record>
<record model="ir.ui.view" id="invoice_form_boe">
<field name="name">account.invoice.form.boe</field>
<field name="model">account.invoice.line</field>
<field name="inherit_id" ref="account.view_invoice_line_form"/>
<field name="arch" type="xml">
<field name="name" position="after">
<group>
<field name="advance_customs_vat"/>
</group>
</field>
</field>
</record>
</field>
</record>
<record model="ir.ui.view" id="invoice_form_boe">
<field name="name">account.invoice.form.boe</field>
<field name="model">account.invoice.line</field>
<field name="inherit_id" ref="account.view_invoice_line_form"/>
<field name="arch" type="xml">
<field name="name" position="after">
<group>
<field name="advance_customs_vat"/>
</group>
</field>
</field>
</record>

</data>
</data>
</openerp>
2 changes: 1 addition & 1 deletion l10n_it_bill_of_entry/company_view.xml
View file
Expand Up @@ -21,5 +21,5 @@
</xpath>
</field>
</record>
</data>
</data>
</openerp>
8 changes: 4 additions & 4 deletions l10n_it_central_journal/views/account_view.xml
View file
Expand Up @@ -12,11 +12,11 @@
<field name="arch" type="xml">
<xpath expr="//field[@name='centralisation']" position="before">
<field name="central_journal_exclude"/>
</xpath>
</xpath>
</field>
</record>
<!--
</record>

<!--
Account Fiscal Year inheritancy
-->

Expand Down
51 changes: 26 additions & 25 deletions l10n_it_corrispettivi/installer_view.xml
View file
Expand Up @@ -2,37 +2,37 @@
<openerp>
<data>

<!-- configartion view -->

<!-- configuration view -->
<record id="view_corrispettivi_config_data" model="ir.ui.view">
<field name="name">Configure Corrispettivi</field>
<field name="model">corrispettivi.config.data</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.res_config_installer"/>
<field name="arch" type="xml">
<data>
<form position="attributes">
<attribute name="string">Corrispettivi Configuration</attribute>
</form>
<separator string="title" position="replace">
<p class="oe_grey">
Select data to configure Corrispettivi module.
</p>
<group string="Configure corrispettivi">
<group colspan="4" >
<field name="default_credit_account_id"/>
<field name="default_debit_account_id"/>
</group>
</group>
</separator>
<footer position="replace">
<footer>
<button name="action_next" type="object" string="Continue" class="oe_highlight"/>
or
<button string="Skip" class="oe_link" special="cancel" />
<data>
<form position="attributes">
<attribute name="string">Corrispettivi Configuration</attribute>
</form>
<separator string="title" position="replace">
<p class="oe_grey">
Select data to configure Corrispettivi module.
</p>
<group string="Configure corrispettivi">
<group colspan="4">
<field name="default_credit_account_id"/>
<field name="default_debit_account_id"/>
</group>
</group>
</separator>
<footer position="replace">
<footer>
<button name="action_next" type="object" string="Continue"
class="oe_highlight"/>
or
<button string="Skip" class="oe_link" special="cancel"/>
</footer>
</footer>
</footer>
</data>
</data>
</field>
</record>

Expand All @@ -47,7 +47,8 @@
</record>

<!-- register configuration wizard -->
<record id="config_wizard_step_corrispettivi_config_data" model="ir.actions.todo">
<record id="config_wizard_step_corrispettivi_config_data"
model="ir.actions.todo">
<field name="action_id" ref="action_corrispettivi_config_data"/>
<field name="sequence">11</field>
<field name="type">automatic</field>
Expand Down
4 changes: 2 additions & 2 deletions l10n_it_corrispettivi/partner_data.xml
View file
Expand Up @@ -4,8 +4,8 @@

<record id="partner_corrispettivi" model="res.partner">
<field name="name">corrispettivi</field>
<field name="active">False</field>
<field name="corrispettivi">True</field>
<field name="active">False</field>
<field name="corrispettivi">True</field>
</record>

</data>
Expand Down

0 comments on commit 98cb679

Please sign in to comment.