diff --git a/models/__init__.py b/models/__init__.py
index dab03728f51bfa5f11fe6514ae77d6fd3d07b99d..98d07273dcbf20a529cdebd6accb44c916c2c726 100644
--- a/models/__init__.py
+++ b/models/__init__.py
@@ -2,3 +2,4 @@
import lefilament_tdb
import res_company
+import hr_employee
diff --git a/models/hr_employee.py b/models/hr_employee.py
new file mode 100644
index 0000000000000000000000000000000000000000..cf5a19b01998a008f305e5a11a67a7315fcfb306
--- /dev/null
+++ b/models/hr_employee.py
@@ -0,0 +1,8 @@
+# -*- 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
diff --git a/models/lefilament_tdb.py b/models/lefilament_tdb.py
index 0a4817118210244971790c881cd8a40746ee6346..6d725ee6baafaa560bb85279bd53862a76218a59 100644
--- a/models/lefilament_tdb.py
+++ b/models/lefilament_tdb.py
@@ -107,6 +107,8 @@ class LeFilamentTdb(models.Model):
'sortie': 0,
'variation': 0,
'target': 100000,
+ 'cca': 0,
+ 'capital': 0,
}
cr.execute("""
SELECT
@@ -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 sortie,
(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; """)
datas = cr.dictfetchall()
cr.execute("select ca_target from res_company;")
ca_target = cr.dictfetchall()
+ cr.execute("select capital from hr_employee;")
+ capital = cr.dictfetchall()
+
res['facture'] =+ datas[0]['facture']
res['a_encaisser'] =+ datas[0]['a_encaisser']
res['pipe'] =+ datas[0]['pipe']
@@ -132,7 +138,9 @@ class LeFilamentTdb(models.Model):
res['sortie'] =+ datas[0]['sortie']
res['variation'] =+ datas[0]['variation']
res['commandes'] =+ datas[0]['commandes']
+ res['cca'] =+ datas[0]['cca']
res['target'] =+ ca_target[0]['ca_target']
+ res['capital'] =+ capital[0]['capital']
return res
diff --git a/static/src/css/lefilament_tdb.css b/static/src/css/lefilament_tdb.css
index 7fe2da46a49fecb150eb87565b475139d43ba453..40371a9aa6891460881de62b045ecead017feed7 100644
--- a/static/src/css/lefilament_tdb.css
+++ b/static/src/css/lefilament_tdb.css
@@ -31,6 +31,7 @@
.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; }
.card { background-color: #fff; color: #73879C; padding: 20px; margin: 10px 0; }
+.card-half { float: left; width: 50%; }
.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; }
.tresorerie .card-number { font-size: 20px; font-weight: 300; }
diff --git a/static/src/xml/lefilament_tdb.xml b/static/src/xml/lefilament_tdb.xml
index 087557098db181a593e9832b22825220bd10aa27..f6673e899d9f21ab7de2adaa1d5aa6fc9b1bed84 100644
--- a/static/src/xml/lefilament_tdb.xml
+++ b/static/src/xml/lefilament_tdb.xml
@@ -138,26 +138,44 @@
</div>
<div class="col-xs-12">
<div class="card">
- <p class="card-header">Encaissé</p>
- <p class="card-number">
- <t t-esc="widget.render_monetary(widget.values.entree)"></t>
- </p>
+ <div class="card-half">
+ <p class="card-header">Encaissé</p>
+ <p class="card-number">
+ <t t-esc="widget.render_monetary(widget.values.entree)"></t>
+ </p>
+ </div>
+ <div class="card-half">
+ <p class="card-header">Sorties</p>
+ <p class="card-number">
+ <t t-esc="widget.render_monetary(widget.values.sortie)"></t>
+ </p>
+ </div>
+ <div class="clearfix"></div>
</div>
</div>
<div class="col-xs-12">
<div class="card">
- <p class="card-header">Sorties</p>
+ <p class="card-header">Variation</p>
<p class="card-number">
- <t t-esc="widget.render_monetary(widget.values.sortie)"></t>
+ <t t-raw="widget.render_monetary_color(widget.values.variation)"></t>
</p>
</div>
</div>
<div class="col-xs-12">
<div class="card">
- <p class="card-header">Variation</p>
- <p class="card-number">
- <t t-raw="widget.render_monetary_color(widget.values.variation)"></t>
- </p>
+ <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>
diff --git a/views/views.xml b/views/views.xml
index adb11f9b71b8891f39d8918ddd41cb89995b3a77..2575f31a1371bf87667b48cba6ea26810b2899e4 100644
--- a/views/views.xml
+++ b/views/views.xml
@@ -108,7 +108,7 @@
</record>
<!-- 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="model">res.company</field>
<field name="inherit_id" ref="base.view_company_form"/>
@@ -118,6 +118,18 @@
</xpath>
</field>
</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">
<field name="name">Le Filament Dashboard Data</field>