Skip to content

Commit

Permalink
Cherry pick of 80098dd failed
Browse files Browse the repository at this point in the history 
stdout:
CONFLICT (modify/delete): l10n_uy_edi/views/account_move_views.xml deleted in HEAD and modified in 80098dd ([FIX] l10n_uy_edi: Re print PDF button). Version 80098dd ([FIX] l10n_uy_edi: Re print PDF button) of l10n_uy_edi/views/account_move_views.xml left in tree.
CONFLICT (modify/delete): l10n_uy_edi/__manifest__.py deleted in HEAD and modified in 80098dd ([FIX] l10n_uy_edi: Re print PDF button). Version 80098dd ([FIX] l10n_uy_edi: Re print PDF button) of l10n_uy_edi/__manifest__.py left in tree.

stderr:
17:54:45.383327 git.c:444               trace: built-in: git cherry-pick 80098dd
error: could not apply 80098dd... [FIX] l10n_uy_edi: Re print PDF button
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
status:
  • Loading branch information
@zaoral
zaoral committed Oct 7, 2024
1 parent e92a474 commit c83824a
Show file tree
Hide file tree
Showing 4 changed files with 143 additions and 2 deletions.
35 changes: 35 additions & 0 deletions l10n_uy_edi/__manifest__.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
##############################################################################
# For copyright and license notices, see __manifest__.py file in module root
# directory
##############################################################################
{
'name': 'Uruguay Electronic Invoice',
'author': 'ADHOC SA',
'category': 'Localization',
'license': 'LGPL-3',
'version': "16.0.1.10.0",
'depends': [
'l10n_uy_account',
'account_debit_note',
],
'data': [
'views/res_config_settings_view.xml',
'views/account_move_views.xml',
'views/res_company_views.xml',
'wizards/res_partner_update_from_padron_uy_wizard_view.xml',
'views/res_partner_view.xml',
'views/product_view.xml',
'views/report_invoice.xml',
'data/cfe_template.xml',
'data/ir_sequence.xml',
'data/ir_actions_server.xml',
'data/ir_cron.xml',
'data/account_incoterms_data.xml',
'security/ir.model.access.csv',
],
'demo': [
'demo/res_company_demo.xml',
'demo/account_journal_demo.xml',
],
'installable': True,
}
106 changes: 106 additions & 0 deletions l10n_uy_edi/views/account_move_views.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
<?xml version='1.0' encoding='utf-8'?>
<odoo>

<record id="view_move_form" model="ir.ui.view">
<field name="name">account.move.form</field>
<field name="model">account.move</field>
<field name="inherit_id" ref="account.view_move_form"/>
<field name="arch" type="xml">

<sheet position="before">
<div class="alert alert-danger" role="alert" style="margin-bottom:0px;" attrs="{'invisible': ['|', '|', ('l10n_uy_journal_type', 'not in', ['electronic', 'contingency']), ('state', '!=', 'posted'), ('l10n_uy_cfe_pdf', '!=', False)]}"><bold>Esta factura esta validada pero le falta el PDF legal asociado, por favor intente re generarlo</bold>
<button name="action_l10n_uy_get_pdf" type="object" string="(UY) Reprint Legal PDF" class="oe_inline oe_link" attrs="{
'invisible': ['|', ('l10n_uy_cfe_state', 'not in', ['received', 'accepted', 'rejected']), ('invoice_filter_type_domain', '=', 'purchase')]}" icon="fa-print"/>
</div>
<div class="alert alert-warning" role="alert" style="margin-bottom:0px;" attrs="{'invisible': ['|', '|', ('l10n_uy_journal_type', 'not in', ['electronic', 'contingency']), ('state', '!=', 'draft'), ('l10n_uy_cfe_pdf', '!=', False)]}"><bold>Esta factura aun no esta validada, asi que si intenta imprimir tendra un PDF no Legal</bold></div>
</sheet>

<div name="journal_div" position="after">
<field name="l10n_uy_journal_type" invisible="1"/>
<field name="l10n_uy_cfe_pdf" invisible="1"/>
<field name="l10n_uy_cfe_state" attrs="{'invisible': [('l10n_uy_journal_type', 'not in', ['electronic', 'contingency'])]}"/>
<field name="l10n_uy_ucfe_msg" attrs="{'invisible': [('l10n_uy_ucfe_state', 'not in', ['xml_error', 'connection_error', 'ucfe_error', 'rejected'])]}"/>
<button name="action_l10n_uy_get_dgi_state" type="object" string="(UY) Consult DGI State" class="oe_inline oe_link" attrs="{'invisible': [('l10n_uy_cfe_state', '!=', 'received')]}" icon="fa-refresh" colspan="2" groups="base.group_no_one"/>
</div>

<group id="header_left_group">
<field name="l10n_uy_additional_info" attrs="{'invisible': [('l10n_uy_journal_type', 'not in', ['electronic', 'contingency'])]}"/>
</group>
<!-- TODO need to find a way to hide computed_currency_rate field, this one is added in l10n_ar_ux, so.. maybe we should add it in another base
ux module. to be re used. Meanwhile we do not show l10n_uy_currency_rate -->
<!-- <div name="currency" position="inside">
<field name="l10n_uy_currency_rate" attrs="{'invisible': ['|', '|', ('l10n_uy_currency_rate', '=', False), ('l10n_uy_currency_rate', '=', 0.0), ('l10n_uy_currency_rate', '=', 1.0)]}"/>
</div> -->

<field name="invoice_incoterm_id" position="after">
<field name="l10n_uy_cfe_sale_mod"/>
<field name="l10n_uy_cfe_transport_route"/>
</field>

<notebook position="inside">
<page name="uy_dgi" string="DGI" attrs="{'invisible': [('l10n_uy_journal_type', 'not in', ['electronic', 'contingency'])]}">
<notebook>
<page string="Detail">
<group string="UCFE" attrs="{'invisible': [('invoice_filter_type_domain', '=', 'purchase')]}">
<field name="l10n_uy_cfe_uuid"/>
<button name="action_l10n_uy_get_uruware_cfe" type="object" string="Get Uruware Invoice" class="oe_link" colspan="2"/>
</group>
<group>
<field name="l10n_uy_ucfe_state"/>
<field name="l10n_uy_ucfe_msg"/>
<field name="l10n_uy_idreq" attrs="{'invisible': [('invoice_filter_type_domain', '!=', 'purchase')]}"/>
<field name="l10n_uy_cfe_file"/>
</group>
<group string="DGI">
<field name="l10n_uy_dgi_barcode"/>
</group>
</page>
<page string="XML CFE" groups="base.group_no_one">
<span attrs="{'invisible': [('invoice_filter_type_domain', '=', 'purchase')]}">
<button name="action_l10n_uy_preview_xml" type="object" string="Preview" class="oe_inline oe_link" states="draft"/>
<button name="action_l10n_uy_validate_cfe" type="object" string="Validate" class="oe_inline oe_link" states="draft"/>
</span>
<div attrs="{'invisible': [('invoice_filter_type_domain', '!=', 'purchase')]}">
<button name="action_l10n_uy_update_fields" type="object" string="Update Fields" class="oe_inline oe_link" states="draft" help="Read the XML and fill the fields of the invoice/bill with the xml values" confirm="Are you sure? this action will update the invoice information."/>
</div>
<field name="l10n_uy_cfe_xml" nolabel="1" widget="ace"/>
</page>
<page string="XML Request" groups="base.group_no_one">
<field name="l10n_uy_dgi_xml_request" nolabel="1" widget="ace"/>
</page>
<page string="XML Response" groups="base.group_no_one">
<field name="l10n_uy_dgi_xml_response" nolabel="1" widget="ace"/>
</page>
</notebook>
</page>
</notebook>
</field>
</record>

<record id="view_invoice_tree" model="ir.ui.view">
<field name="name">account.move.view.tree</field>
<field name="model">account.move</field>
<field name="inherit_id" ref="account.view_invoice_tree"/>
<field name="arch" type="xml">
<tree>
<field name="l10n_uy_cfe_state" optional="hide"/>
</tree>
</field>
</record>

<record id="view_account_invoice_filter" model="ir.ui.view">
<field name="name">account.move.view.search</field>
<field name="model">account.move</field>
<field name="inherit_id" ref="account.view_account_invoice_filter"/>
<field name="arch" type="xml">
<search>
<field name="l10n_uy_cfe_state"/>
</search>
<group>
<filter string="CFE State" name="cfe_state" context="{'group_by':'l10n_uy_cfe_state'}"/>
</group>

</field>
</record>

</odoo>
2 changes: 1 addition & 1 deletion l10n_uy_edi_stock/__manifest__.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": """Uruguay - E-Remitos""",
'version': "16.0.1.1.0",
'version': "16.0.1.2.0",
'category': 'Accounting/Localizations/EDI',
'sequence': 12,
'author': 'Adhoc',
Expand Down
2 changes: 1 addition & 1 deletion l10n_uy_edi_stock/views/stock_picking_views.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<button name="action_l10n_uy_get_dgi_state" type="object" string="(UY) Consult DGI State" class="oe_link" colspan="2" attrs="{'invisible': [('l10n_uy_cfe_state', '!=', 'received')]}" icon="fa-refresh"/>
<button name="action_l10n_uy_get_pdf" type="object" string="(UY) Print Legal PDF" class="oe_link" colspan="2" attrs="{
'invisible': [('l10n_uy_cfe_state', 'not in', ['received'])]}" icon="fa-print"/>
'invisible': [('l10n_uy_cfe_state', 'not in', ['received', 'accepted', 'rejected'])]}" icon="fa-print"/>

</xpath>

Expand Down

0 comments on commit c83824a

Please sign in to comment.