Skip to content

Commit

Permalink
[FIX] account_factoring_receivable_balance_factofrance
Browse files Browse the repository at this point in the history
  • Loading branch information
@dreispt
dreispt committed Jul 4, 2024
1 parent bfebb9f commit 86dd4e4
Show file tree
Hide file tree
Showing 6 changed files with 210 additions and 197 deletions.
105 changes: 63 additions & 42 deletions account_factoring_receivable_balance/views/subrogation_receipt.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,42 @@
<header>
<button
name="action_compute_lines"
id="action_compute_lines_highlighted"
type="object"
string="Compute"
invisible="state != 'draft'"
invisible="not(state == 'draft' and not item_ids)"
class="oe_highlight"
/>
<button
name="action_compute_lines"
id="action_compute_lines"
type="object"
string="Compute"
invisible="not(state == 'draft' and item_ids)"
/>
<button
name="action_confirm"
type="object"
string="Confirm"
invisible="not item_ids or state != 'draft'"
invisible="not(state =='draft' and item_ids)"
class="oe_highlight"
/>
<button
name="action_post"
type="object"
string="Post"
invisible="state != 'confirmed'"
invisible="not(state == 'confirmed')"
class="oe_highlight"
/>
<!-- TODO: view items is now a smart button;
repurpose to show Factoring JEs generated
<button
name="action_goto_moves"
type="object"
invisible="not item_ids"
string="See account moves"
/>
-->
<field name="state" widget="statusbar" />
</header>
<sheet>
Expand All @@ -50,28 +62,31 @@
<div class="oe_title" name="journal">
<h2>
<label name="Journal" for="factor_journal_id" />
<field name="factor_journal_id" />
<field
name="factor_journal_id"
readonly="state != 'draft'"
/>
</h2>
</div>
<group name="main" colspan="2">
<group name="main" colspan="2" readonly="state != 'draft'">
<group name="left" invisible="not factor_journal_id">
<field name="factor_type" />
<field name="target_date" />
<field name="date" invisible="not date" />
<field name="statement_date" />
<field name="currency_id" invisible="1" />
<field
name="balance"
widget="monetary"
options="{'currency_field': 'currency_id', 'field_digits': True}"
/>
<field name="company_id" invisible="1" />
<field
name="company_id"
groups="base.group_multi_company"
/>
<field name="company_id" invisible="1" />
<field name="currency_id" invisible="1" />
</group>
<group name="right" invisible="state == 'draft'">
<field name="date" invisible="not date" />
<field
name="balance"
widget="monetary"
options="{'currency_field': 'currency_id', 'field_digits': True}"
/>
<field name="holdback_amount" />
<separator string="Expenses" colspan="2" />
<field
Expand All @@ -90,61 +105,67 @@
</group>
</group>

<notebook>
<page name="lines" string="Lines">>

<field name="item_ids" colspan="4">
<tree>
<field name="id" optional="hide" />
<field name="create_date" optional="hide" />
<field name="date" optional="show" />
<field
name="journal_id"
options="{&quot;no_open&quot;:True}"
/>
<field name="partner_id" optional="hide" />
name="journal_id"
options="{&quot;no_open&quot;:True}"
/>
<field name="partner_id" optional="show" />
<field name="partner_ref" optional="show" />
<field name="statement_id" invisible="1" />
<field name="ref" optional="show" />
<field name="name" optional="show" />
<field
name="tax_ids"
widget="many2many_tags"
width="0.5"
optional="hide"
/>
name="tax_ids"
widget="many2many_tags"
width="0.5"
optional="hide"
/>
<field name="debit" sum="Total Debit" />
<field name="credit" sum="Total Credit" />
<field
name="amount_currency"
groups="base.group_multi_currency"
optional="show"
string="In currency"
/>
name="amount_currency"
groups="base.group_multi_currency"
optional="show"
string="In currency"
/>
<field name="move_id" optional="show" />
<field name="bank_id" optional="show" />
<field name="full_reconcile_id" optional="hide" />
<field
name="account_id"
optional="hide"
groups="account.group_account_readonly"
/>
name="account_id"
optional="hide"
groups="account.group_account_readonly"
/>
<field
name="currency_id"
readonly="1"
groups="base.group_multi_currency"
optional="hide"
string="Original Currency"
/>
name="currency_id"
readonly="1"
groups="base.group_multi_currency"
optional="hide"
string="Original Currency"
/>
<field
name="tax_tag_ids"
widget="many2many_tags"
width="0.5"
optional="hide"
/>
name="tax_tag_ids"
widget="many2many_tags"
width="0.5"
optional="hide"
/>
<field name="date_maturity" optional="hide" />
<field name="company_currency_id" invisible="1" />
<field name="parent_state" invisible="1" />
</tree>
</field>

</page>
</notebook>

</sheet>
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers" />
Expand Down
11 changes: 4 additions & 7 deletions account_factoring_receivable_balance_bpce/static/description/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@

/*
:Author: David Goodger ([email protected])
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Copyright: This stylesheet has been placed in the public domain.

Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.

See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
Expand Down Expand Up @@ -275,7 +274,7 @@
margin-left: 2em ;
margin-right: 2em }

pre.code .ln { color: gray; } /* line numbers */
pre.code .ln { color: grey; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
Expand All @@ -301,7 +300,7 @@
span.pre {
white-space: pre }

span.problematic, pre.problematic {
span.problematic {
color: red }

span.section-subtitle {
Expand Down Expand Up @@ -444,9 +443,7 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org">
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
</a>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.</p>
Expand Down
4 changes: 2 additions & 2 deletions account_factoring_receivable_balance_factofrance/data/subrogation_seq.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<record id="factoring_receivable_seq" model="ir.sequence">
<field name="name">Factoring Receivable</field>
<field name="code">factoring.receivable</field>
<field name="padding">5</field>
<field name="padding">3</field>
<field name="company_id" eval="False" />
</record>
</odoo>
</odoo>
Loading

0 comments on commit 86dd4e4

Please sign in to comment.