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

[fix] error js action view | add css | update progressbar

parent 76d6e267
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -21,14 +21,16 @@ ...@@ -21,14 +21,16 @@
} }
.card { .card {
color: #73879c;
margin: 10px 0; margin: 10px 0;
} }
.card-body {
color: #73879c;
}
.card a { .card a {
color: inherit; color: inherit;
} }
.card-number a { .card-number a {
color: inherit; color: #73879c;
} }
.card-half { .card-half {
float: left; float: left;
...@@ -75,6 +77,7 @@ p.card-maj { ...@@ -75,6 +77,7 @@ p.card-maj {
#pipe, #pipe,
#facture, #facture,
#fournisseur, #fournisseur,
#statement_lines,
#releve { #releve {
cursor: pointer; cursor: pointer;
} }
......
...@@ -36,6 +36,9 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) { ...@@ -36,6 +36,9 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) {
"click #releve": function () { "click #releve": function () {
this.releve(); this.releve();
}, },
"click #statement_lines": function () {
this.statement_lines();
},
}, },
init: function () { init: function () {
...@@ -52,11 +55,19 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) { ...@@ -52,11 +55,19 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) {
this._rpc({ this._rpc({
model: "ir.model.data", model: "ir.model.data",
method: "xmlid_to_res_id", method: "xmlid_to_res_id",
args: ["account.view_move_form"], args: ["account.view_invoice_form"],
}).then(function (results) { }).then(function (results) {
self.invoice_view_id = results; self.invoice_view_id = results;
}); });
this._rpc({
model: "ir.model.data",
method: "xmlid_to_res_id",
args: ["lefilament_tdb.view_invoice_tree"],
}).then(function (results) {
self.invoice_tree_id = results;
});
this._rpc({ this._rpc({
model: "ir.model.data", model: "ir.model.data",
method: "xmlid_to_res_id", method: "xmlid_to_res_id",
...@@ -96,16 +107,10 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) { ...@@ -96,16 +107,10 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) {
).toFixed(0); ).toFixed(0);
self.ptarg = self.ptarg =
100 - 100 -
self.pfact - self.pfact;
self.pcomm -
self.ppipe_win -
self.ppipe_to_win;
self.ptarg2 = self.ptarg2 =
self.values.target - self.values.target -
self.pfact2 - self.pfact2;
self.pcomm2 -
self.ppipe2_to_win -
self.ppipe2_win;
self.total = ( self.total = (
((self.values.facture + ((self.values.facture +
self.values.commandes + self.values.commandes +
...@@ -125,7 +130,7 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) { ...@@ -125,7 +130,7 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) {
self.total2 = self.pfact2 + self.pcomm2 + self.ppipe2_win; self.total2 = self.pfact2 + self.pcomm2 + self.ppipe2_win;
self.target = self.values.target; self.yeartarget = self.values.target;
deferred.resolve(); deferred.resolve();
}); });
...@@ -143,6 +148,7 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) { ...@@ -143,6 +148,7 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) {
this.ctx = this.$el.find("#target")[0].getContext("2d"); this.ctx = this.$el.find("#target")[0].getContext("2d");
var yeartarget = this.yeartarget
var ptarg = this.ptarg; var ptarg = this.ptarg;
var max_xaxis = 100; var max_xaxis = 100;
...@@ -153,10 +159,7 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) { ...@@ -153,10 +159,7 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) {
var dataset_stacked = [ var dataset_stacked = [
{label: "Facturé", data: [this.pfact], backgroundColor: "#8ED8A2"}, {label: "Facturé", data: [this.pfact], backgroundColor: "#8ED8A2"},
{label: "Commandes", data: [this.pcomm], backgroundColor: "#F6DCA2"}, {label: "À facturer", data: [ptarg], backgroundColor: "#eee"},
{label: "Gagné", data: [this.ppipe_win], backgroundColor: "#F6CCA2"},
{label: "Pipe", data: [this.ppipe_to_win], backgroundColor: "#F6ACA2"},
{label: "To Do", data: [ptarg], backgroundColor: "#eee"},
]; ];
var label = "Année " + moment(Date.now()).format("YYYY"); var label = "Année " + moment(Date.now()).format("YYYY");
...@@ -210,10 +213,10 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) { ...@@ -210,10 +213,10 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) {
titleFontColor: "#999", titleFontColor: "#999",
bodyFontColor: "#777", bodyFontColor: "#777",
callbacks: { callbacks: {
label: function (tooltipItems) { label: function (tooltipItems, data) {
return ( return (
( (
(tooltipItems.xLabel * self.target) / (tooltipItems.xLabel * yeartarget) /
100000 100000
).toLocaleString("fr", {maximumFractionDigits: 2}) + ).toLocaleString("fr", {maximumFractionDigits: 2}) +
" K€" " K€"
...@@ -265,20 +268,24 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) { ...@@ -265,20 +268,24 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) {
facture: function (fiscalyear) { facture: function (fiscalyear) {
var self = this; var self = this;
var context = {user_id: session.uid}; var context = {
user_id: session.uid,
search_default_posted: 1,
};
console.log(self.invoice_tree_id)
console.log(self.invoice_view_id)
var action = { var action = {
type: "ir.actions.act_window", type: "ir.actions.act_window",
res_model: "account.move", res_model: "account.move",
view_mode: "tree,form", view_mode: "tree,pivot,graph,form",
views: [ views: [
[false, "list"], [self.invoice_tree_id, "list"],
[false, "pivot"], [false, "pivot"],
[false, "graph"], [false, "graph"],
[self.invoice_view_id, "form"], [self.invoice_view_id, "form"],
], ],
domain: [ domain: [
["state", "=", "posted"],
["move_type", "in", ["out_invoice", "out_refund"]], ["move_type", "in", ["out_invoice", "out_refund"]],
["invoice_date", ">=", fiscalyear], ["invoice_date", ">=", fiscalyear],
], ],
...@@ -287,6 +294,8 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) { ...@@ -287,6 +294,8 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) {
context: context, context: context,
}; };
console.log(action)
this.do_action(action); this.do_action(action);
}, },
commandes: function () { commandes: function () {
...@@ -364,7 +373,7 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) { ...@@ -364,7 +373,7 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) {
res_model: "account.move", res_model: "account.move",
view_mode: "tree,form", view_mode: "tree,form",
views: [ views: [
[false, "list"], [self.invoice_tree_id, "list"],
[false, "pivot"], [false, "pivot"],
[false, "graph"], [false, "graph"],
[self.invoice_view_id, "form"], [self.invoice_view_id, "form"],
...@@ -420,6 +429,26 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) { ...@@ -420,6 +429,26 @@ odoo.define("lefilament_tdb.dashboard_year", function (require) {
context: context, context: context,
}; };
this.do_action(action);
},
statement_lines: function () {
var context = {user_id: session.uid};
var action = {
type: "ir.actions.act_window",
res_model: "account.bank.statement.line",
view_mode: "tree,pivot,graph,form",
views: [
[false, "list"],
[false, "pivot"],
[false, "graph"],
[false, "form"],
],
target: "current",
name: "Lignes de banque",
context: context,
};
this.do_action(action); this.do_action(action);
}, },
}); });
......
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
</tr> </tr>
<tr> <tr>
<td style="background-color: #eee; width: 20px;" /> <td style="background-color: #eee; width: 20px;" />
<td>To Do</td> <td>À facturer</td>
<td class="nb"><t <td class="nb"><t
t-esc="widget.render_percent(widget.ptarg)" t-esc="widget.render_percent(widget.ptarg)"
/></td> /></td>
...@@ -218,7 +218,9 @@ ...@@ -218,7 +218,9 @@
<div class="tab-content card-tab" id="myTab2Content"> <div class="tab-content card-tab" id="myTab2Content">
<div id="variation" class="tab-pane fade show active in"> <div id="variation" class="tab-pane fade show active in">
<p class="card-number"> <p class="card-number">
<a id="statement_lines">
<t t-raw="widget.render_monetary_color(widget.values.variation)" /> <t t-raw="widget.render_monetary_color(widget.values.variation)" />
</a>
</p> </p>
</div> </div>
<div id="e_s" class="tab-pane fade"> <div id="e_s" class="tab-pane fade">
...@@ -238,24 +240,6 @@ ...@@ -238,24 +240,6 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <div class="col-xs-12">
<div class="card card-cca">
<div class="card-body">
<div class="card-cca-half">
<h5 class="card-title">CCA en cours</h5>
<p class="card-number">
<t t-raw="widget.render_monetary(widget.values.cca)"></t>
</p>
</div>
<div class="card-cca-half">
<h5 class="card-title">Capital Social</h5>
<p class="card-number">
<t t-raw="widget.render_monetary(widget.values.capital)"></t>
</p>
</div>
</div>
</div>
</div> -->
</div> </div>
</div> </div>
</div> </div>
......
...@@ -102,6 +102,32 @@ ...@@ -102,6 +102,32 @@
sequence="10" sequence="10"
/> />
<record id="view_invoice_tree" model="ir.ui.view">
<field name="name">account.invoice.tree</field>
<field name="model">account.move</field>
<field name="arch" type="xml">
<tree string="Invoices">
<field name="name" decoration-bf="1"/>
<field name="invoice_date" string="Date Facturation"/>
<field name="partner_id" string="Client"/>
<field name="invoice_date_due" />
<field name="invoice_origin"/>
<field name="payment_reference" optional="hide"/>
<field name="ref" optional="hide"/>
<field name="invoice_user_id" widget="many2one_avatar_user"/>
<field name="amount_untaxed_signed" string="Montant HT" sum="Total" decoration-bf="1" />
<field name="amount_tax_signed" sum="Total" optional="hide"/>
<field name="amount_total_signed" string="Total" sum="Total" optional="show"/>
<field name="amount_residual_signed" string="Montant Dû" sum="Amount Due" optional="show"/>
<field name="currency_id" invisible="1"/>
<field name="company_currency_id" invisible="1"/>
<field name="state" widget="badge" decoration-success="state == 'posted'" decoration-info="state == 'draft'" optional="show"/>
<field name="payment_state" widget="badge" decoration-danger="payment_state == 'not_paid'" decoration-warning="payment_state in ('partial', 'in_payment')" decoration-success="payment_state in ('paid', 'reversed')" attrs="{'invisible': [('payment_state', 'in', ('invoicing_legacy'))]}"/>
<field name="move_type" invisible="1"/>
</tree>
</field>
</record>
<record id="lefilament_dashboard_tree" model="ir.ui.view"> <record id="lefilament_dashboard_tree" model="ir.ui.view">
<field name="name">Le Filament Dashboard Treeview</field> <field name="name">Le Filament Dashboard Treeview</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