Skip to content
Extraits de code Groupes Projets
Valider fdf935ec rédigé par Benjamin's avatar Benjamin
Parcourir les fichiers

[add] CCA + capital social

parent 00d82048
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -2,3 +2,4 @@ ...@@ -2,3 +2,4 @@
import lefilament_tdb import lefilament_tdb
import res_company import res_company
import hr_employee
# -*- coding: utf-8 -*-
from openerp import models, fields
class hr_employee(models.Model):
_name = "hr.employee"
_inherit = "hr.employee"
capital = fields.Float( "Apport Capital Social" )
\ No newline at end of file
...@@ -107,6 +107,8 @@ class LeFilamentTdb(models.Model): ...@@ -107,6 +107,8 @@ class LeFilamentTdb(models.Model):
'sortie': 0, 'sortie': 0,
'variation': 0, 'variation': 0,
'target': 100000, 'target': 100000,
'cca': 0,
'capital': 0,
} }
cr.execute(""" cr.execute("""
SELECT SELECT
...@@ -118,12 +120,16 @@ class LeFilamentTdb(models.Model): ...@@ -118,12 +120,16 @@ class LeFilamentTdb(models.Model):
(select sum(amount) from account_bank_statement_line where amount > 0 and date >= date_trunc('year', current_date) ) as entree, (select sum(amount) from account_bank_statement_line where amount > 0 and date >= date_trunc('year', current_date) ) as entree,
(select sum(amount) from account_bank_statement_line where amount < 0 and date >= date_trunc('year', current_date) ) as sortie, (select sum(amount) from account_bank_statement_line where amount < 0 and date >= date_trunc('year', current_date) ) as sortie,
(select sum(amount) from account_bank_statement_line where date >= date_trunc('year', current_date) ) as variation, (select sum(amount) from account_bank_statement_line where date >= date_trunc('year', current_date) ) as variation,
(select sum(total_amount) from hr_expense where payment_mode='own_account' and state!='done' ) as cca,
(select sum(price_subtotal-qty_invoiced*price_unit) from sale_order_line where invoice_status='to invoice') as commandes; """) (select sum(price_subtotal-qty_invoiced*price_unit) from sale_order_line where invoice_status='to invoice') as commandes; """)
datas = cr.dictfetchall() datas = cr.dictfetchall()
cr.execute("select ca_target from res_company;") cr.execute("select ca_target from res_company;")
ca_target = cr.dictfetchall() ca_target = cr.dictfetchall()
cr.execute("select capital from hr_employee;")
capital = cr.dictfetchall()
res['facture'] =+ datas[0]['facture'] res['facture'] =+ datas[0]['facture']
res['a_encaisser'] =+ datas[0]['a_encaisser'] res['a_encaisser'] =+ datas[0]['a_encaisser']
res['pipe'] =+ datas[0]['pipe'] res['pipe'] =+ datas[0]['pipe']
...@@ -132,7 +138,9 @@ class LeFilamentTdb(models.Model): ...@@ -132,7 +138,9 @@ class LeFilamentTdb(models.Model):
res['sortie'] =+ datas[0]['sortie'] res['sortie'] =+ datas[0]['sortie']
res['variation'] =+ datas[0]['variation'] res['variation'] =+ datas[0]['variation']
res['commandes'] =+ datas[0]['commandes'] res['commandes'] =+ datas[0]['commandes']
res['cca'] =+ datas[0]['cca']
res['target'] =+ ca_target[0]['ca_target'] res['target'] =+ ca_target[0]['ca_target']
res['capital'] =+ capital[0]['capital']
return res return res
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
.yeardashboard { background-color: #F7F7F7; padding: 20px; min-height: 100%; } .yeardashboard { background-color: #F7F7F7; padding: 20px; min-height: 100%; }
.yeardashboard h3 { margin: 10px 15px; font-size: 20px; font-weight: 400; border-bottom: 1px solid #ddd; color: #5E6975; } .yeardashboard h3 { margin: 10px 15px; font-size: 20px; font-weight: 400; border-bottom: 1px solid #ddd; color: #5E6975; }
.card { background-color: #fff; color: #73879C; padding: 20px; margin: 10px 0; } .card { background-color: #fff; color: #73879C; padding: 20px; margin: 10px 0; }
.card-half { float: left; width: 50%; }
.card-header { margin: 0!important; } .card-header { margin: 0!important; }
.card-number { font-size: 30px; font-weight: 300; margin: 0!important; font-family: "Helvetica Neue", Helvetica, "Open Sans", Arial, sans-serif; } .card-number { font-size: 30px; font-weight: 300; margin: 0!important; font-family: "Helvetica Neue", Helvetica, "Open Sans", Arial, sans-serif; }
.tresorerie .card-number { font-size: 20px; font-weight: 300; } .tresorerie .card-number { font-size: 20px; font-weight: 300; }
......
...@@ -138,19 +138,20 @@ ...@@ -138,19 +138,20 @@
</div> </div>
<div class="col-xs-12"> <div class="col-xs-12">
<div class="card"> <div class="card">
<div class="card-half">
<p class="card-header">Encaissé</p> <p class="card-header">Encaissé</p>
<p class="card-number"> <p class="card-number">
<t t-esc="widget.render_monetary(widget.values.entree)"></t> <t t-esc="widget.render_monetary(widget.values.entree)"></t>
</p> </p>
</div> </div>
</div> <div class="card-half">
<div class="col-xs-12">
<div class="card">
<p class="card-header">Sorties</p> <p class="card-header">Sorties</p>
<p class="card-number"> <p class="card-number">
<t t-esc="widget.render_monetary(widget.values.sortie)"></t> <t t-esc="widget.render_monetary(widget.values.sortie)"></t>
</p> </p>
</div> </div>
<div class="clearfix"></div>
</div>
</div> </div>
<div class="col-xs-12"> <div class="col-xs-12">
<div class="card"> <div class="card">
...@@ -160,6 +161,23 @@ ...@@ -160,6 +161,23 @@
</p> </p>
</div> </div>
</div> </div>
<div class="col-xs-12">
<div class="card">
<div class="card-half">
<p class="card-header">CCA en cours</p>
<p class="card-number">
<t t-raw="widget.render_monetary(widget.values.cca)"></t>
</p>
</div>
<div class="card-half">
<p class="card-header">Capital Social</p>
<p class="card-number">
<t t-raw="widget.render_monetary(widget.values.capital)"></t>
</p>
</div>
<div class="clearfix"></div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
</record> </record>
<!-- Company Form --> <!-- Company Form -->
<record id="view_form_lefilament_project_form_inherited" model="ir.ui.view"> <record id="view_form_lefilament_company_form_inherited" model="ir.ui.view">
<field name="name">res.company.form.tdb</field> <field name="name">res.company.form.tdb</field>
<field name="model">res.company</field> <field name="model">res.company</field>
<field name="inherit_id" ref="base.view_company_form"/> <field name="inherit_id" ref="base.view_company_form"/>
...@@ -119,6 +119,18 @@ ...@@ -119,6 +119,18 @@
</field> </field>
</record> </record>
<!-- Company Form -->
<record id="view_form_lefilament_emplyee_form_inherited" model="ir.ui.view">
<field name="name">hr.employee.form.tdb</field>
<field name="model">hr.employee</field>
<field name="inherit_id" ref="hr.view_employee_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='work_phone']" position="after">
<field name="capital" />
</xpath>
</field>
</record>
<!-- <record id="lefilament_dashboard_data" model="ir.ui.view"> <!-- <record id="lefilament_dashboard_data" model="ir.ui.view">
<field name="name">Le Filament Dashboard Data</field> <field name="name">Le Filament Dashboard Data</field>
<field name="model">lefilament.dashboard.data</field> <field name="model">lefilament.dashboard.data</field>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter