devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2930 from expsa/you_dev_odex25_project 

Imp Project Status Report
This commit is contained in:
kchyounes19 2025-04-29 12:38:34 +01:00 committed by GitHub
parent 02b8085b67 444db62304
commit d6caedfa10
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
odex25_project/project_base/i18n/ar_001.po
View File

@ -270,8 +270,8 @@ msgstr "<span style=\"font-weight: bold;\">الضريبة</span>"
#. module: project_base
#: model_terms:ir.ui.view,arch_db:project_base.project_status_qweb_report
msgid "<span>Total</span>"
msgstr "<span>الاجمالي</span>"
msgid "<span style="font-weight: bold;">Total</span>"
msgstr "<span style="font-weight: bold;">الاجمالي</span>"
#. module: project_base
#: model_terms:ir.ui.view,arch_db:project_base.project_status_qweb_report

34
odex25_project/project_base/report/project_report_templates.xml
View File

@ -345,13 +345,13 @@
<span>Contract Amount</span>
</td>
<td style="border: 1px solid black;">
<span t-esc="e.contract_value_untaxed"/>
<span t-esc="'%.2f' % e.contract_value_untaxed"/>
</td>
<td style="border: 1px solid black;">
<span>Consultant Fees</span>
</td>
<td style="border: 1px solid black;">
<span t-esc="e.consultant_cost"/>
<span t-esc="'%.2f' % e.consultant_cost"/>
</td>
</tr>
<tr>
@ -359,13 +359,13 @@
<span>Tax amount</span>
</td>
<td style="border: 1px solid black;">
<span t-esc="e.tax_amount"/>
<span t-esc="'%.2f' % e.tax_amount"/>
</td>
<td style="border: 1px solid black;">
<span>Total</span>
</td>
<td style="border: 1px solid black;">
<span t-esc="e.contract_value"/>
<span t-esc="'%.2f' % e.contract_value"/>
</td>
</tr>
<tr>
@ -374,10 +374,14 @@
</td>
<td style="border: 1px solid black;">
<!-- <span t-esc="(e.total_invoiced_amount or 0) - (e.contract_value or 0) + (e.contract_value or 0)"/>-->
<t t-set="invoiced" t-value="e.total_invoiced_amount - e.contract_value"/>
<t t-set="additional_work" t-value="abs(invoiced + e.consultant_cost)"/>
<span t-esc="additional_work"/>
<t t-if="e.total_invoiced_amount &gt; (e.contract_value + e.consultant_cost)">
<t t-set="additional_work"
t-value="e.total_invoiced_amount - e.contract_value - e.consultant_cost"/>
</t>
<t t-else="">
<t t-set="additional_work" t-value="0"/>
</t>
<span t-esc="'%.2f' % additional_work"/>
</td>
<td style="border: 1px solid black;"/>
<td style="border: 1px solid black;"/>
@ -423,22 +427,22 @@
<t t-foreach="invoice.project_invline_ids" t-as="line">
<t t-set="subtotal" t-value="subtotal + line.price_subtotal"/>
</t>
<span t-esc="subtotal"/>
<span t-esc="'%.2f' % subtotal"/>
</td>
<td style="border: 1px solid black;">
<t t-set="tax_total" t-value="0"/>
<t t-foreach="invoice.project_invline_ids" t-as="line">
<t t-set="tax_total" t-value="tax_total + line.price_tax"/>
</t>
<span t-esc="tax_total"/>
<span t-esc="'%.2f' % tax_total"/>
</td>
<td style="border: 1px solid black;">
<span t-esc="invoice.amount"/>
<span t-esc="'%.2f' % invoice.amount"/>
</td>
<!-- <td style="border: 1px solid black;">-->
<!-- <span t-esc="dict(invoice._fields['payment_state'].selection).get(invoice.payment_state or 'not_paid')"/>-->
<!-- &lt;!&ndash; <span t-field="invoice.payment_state"/>&ndash;&gt;-->
<!-- </td>-->
<!-- <td style="border: 1px solid black;">-->
<!-- <span t-esc="dict(invoice._fields['payment_state'].selection).get(invoice.payment_state or 'not_paid')"/>-->
<!-- &lt;!&ndash; <span t-field="invoice.payment_state"/>&ndash;&gt;-->
<!-- </td>-->
<td style="border: 1px solid black;">
<t t-set="label_dict"
t-value="dict(invoice._fields['payment_state']._description_selection(invoice.env))"/>