diff options
| author | fw-bot <otis@odoo.com> | 2019-10-16 09:18:15 +0000 |
|---|---|---|
| committer | Josse Colpaert <jco@odoo.com> | 2019-10-16 11:37:28 +0000 |
| commit | eaa094285e489dadc5607cfb9ec44fc721322a29 (patch) | |
| tree | 4bc5c9e6c16f3dc86d3ab7948c7532c53ecaff55 /addons/l10n_pe/data | |
| parent | cddf577abb991568197f31bf3ba3cad13aabd0ea (diff) | |
[FIX] l1n_pe: forward-port of fixes to l10n_pe
base_vat: Correct management of the check of peruvian VAT without prefix.
l10n_pe: Correct income account the last one is not correct.
l10n_pe: Forced Round globally for peruvian companies once l10n_pe is
installed, and with the onchange.
l10n_pe: For peruvian companies it does not make sense a sequence per
year and the year in the prefix is incorrect, we must force XXX- as
a sequence prefix.
closes odoo/odoo#38854
Forward-port-of: #38764
Signed-off-by: Josse Colpaert <jco@openerp.com>
Diffstat (limited to 'addons/l10n_pe/data')
| -rw-r--r-- | addons/l10n_pe/data/l10n_pe_chart_post_data.xml | 2 | ||||
| -rw-r--r-- | addons/l10n_pe/data/res_country_data.xml | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/addons/l10n_pe/data/l10n_pe_chart_post_data.xml b/addons/l10n_pe/data/l10n_pe_chart_post_data.xml index b28f5129674..5103fa97f27 100644 --- a/addons/l10n_pe/data/l10n_pe_chart_post_data.xml +++ b/addons/l10n_pe/data/l10n_pe_chart_post_data.xml @@ -6,7 +6,7 @@ <field name="property_account_payable_id" ref="chart4212"/> <field name="property_account_expense_categ_id" ref="chart6329"/> <field name="property_account_expense_id" ref="chart6011"/> - <field name="property_account_income_categ_id" ref="chart70111"/> + <field name="property_account_income_categ_id" ref="chart70121"/> <field name="property_stock_account_input_categ_id" ref="chart6111"/> <field name="property_stock_account_output_categ_id" ref="chart69111"/> <field name="property_stock_valuation_account_id" ref="chart20111"/> diff --git a/addons/l10n_pe/data/res_country_data.xml b/addons/l10n_pe/data/res_country_data.xml index 72aede8be3c..4b6a12df565 100644 --- a/addons/l10n_pe/data/res_country_data.xml +++ b/addons/l10n_pe/data/res_country_data.xml @@ -9,22 +9,22 @@ <div class="o_address_format"> <field name="parent_id" invisible="1"/> <field name="type" invisible="1"/> - <field name="street" invisible="1"/> - <field name="street_name" placeholder="Street Name..." attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/> - <field name="street2" placeholder="Street2"/> + <field name="street_name" placeholder="Street Name..." attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}" class="oe_read_only"/> + <field name="street" placeholder="Street" class="oe_edit_only"/> + <field name="street2" placeholder="Street2" invisible="1"/> <div class="o_row"> <label for="street_number" class="oe_edit_only"/> - <span> </span> <field name="street_number" attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/> + <span> </span> <label for="street_number2" class="oe_edit_only"/> <field name="street_number2" attrs="{'readonly': [('type', '=', 'contact'),('parent_id', '!=', False)]}"/> </div> <field name="l10n_pe_district" placeholder="District..."/> <field name="city" placeholder="Province..." invisible="1"/> - <field name="city_id" placeholder="Province..." /> + <field name="city_id" placeholder="Province..."/> <field name="state_id" class="o_address_state" placeholder="State..." options='{"no_open": True}'/> - <field name="zip" placeholder="ZIP" class="o_address_zip"/> <field name="country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/> + <field name="zip" placeholder="ZIP" class="o_address_zip"/> </div> </form> </field> @@ -32,5 +32,7 @@ <record id="base.pe" model="res.country"> <field name="enforce_cities" eval="1" /> <field name="address_view_id" ref="pe_partner_address_form" /> + <field name="address_format" eval="'%(street)s\n%(city)s\n%(state_name)s\n%(country_name)s'"/> + <field name="street_format" eval="'%(street_name)s %(street_number)s, %(street_number2)s'"/> </record> </odoo> |