diff --git a/setup/stock_card_report/odoo/addons/stock_card_report b/setup/stock_card_report/odoo/addons/stock_card_report new file mode 120000 index 0000000..b62e1ea --- /dev/null +++ b/setup/stock_card_report/odoo/addons/stock_card_report @@ -0,0 +1 @@ +../../../../stock_card_report \ No newline at end of file diff --git a/setup/stock_card_report/setup.py b/setup/stock_card_report/setup.py new file mode 100644 index 0000000..28c57bb --- /dev/null +++ b/setup/stock_card_report/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/stock_card_report/data/paper_format.xml b/stock_card_report/data/paper_format.xml index 163c384..ca082e9 100644 --- a/stock_card_report/data/paper_format.xml +++ b/stock_card_report/data/paper_format.xml @@ -2,7 +2,7 @@ Stock Card A4 - + A4 0 0 @@ -11,7 +11,7 @@ 28 7 7 - + 24 90 diff --git a/stock_card_report/data/report_data.xml b/stock_card_report/data/report_data.xml index f630564..873a0ab 100644 --- a/stock_card_report/data/report_data.xml +++ b/stock_card_report/data/report_data.xml @@ -6,21 +6,25 @@ - + - + diff --git a/stock_card_report/reports/stock_card_report.xml b/stock_card_report/reports/stock_card_report.xml index f993f2d..0310d15 100644 --- a/stock_card_report/reports/stock_card_report.xml +++ b/stock_card_report/reports/stock_card_report.xml @@ -1,26 +1,39 @@ - + - - + + - - + + @@ -28,15 +41,19 @@ - Print - Export + Print + Export - - + + @@ -44,7 +61,7 @@ - + @@ -54,36 +71,45 @@ - Stock Card - - + Stock Card - + - + - + - + - + Initial - - + + - + - - - - + + + + - + @@ -97,13 +123,13 @@ - + - + - + @@ -124,19 +150,19 @@ - + - + - + - + - + diff --git a/stock_card_report/static/src/css/report.css b/stock_card_report/static/src/css/report.css index a07a6cd..043291d 100644 --- a/stock_card_report/static/src/css/report.css +++ b/stock_card_report/static/src/css/report.css @@ -2,7 +2,7 @@ display: table !important; background-color: white; } -.act_as_row { +.act_as_row { display: table-row !important; page-break-inside: avoid; } @@ -14,21 +14,21 @@ display: table-header-group !important; } .act_as_row.labels { - background-color:#F0F0F0 !important; + background-color: #f0f0f0 !important; } .data_table { width: 100% !important; - border-left:0px; - border-right:0px; - text-align:center; - font-size:10px; - padding-right:3px; - padding-left:3px; - padding-top:2px; - padding-bottom:2px; - border-collapse:collapse; + border-left: 0px; + border-right: 0px; + text-align: center; + font-size: 10px; + padding-right: 3px; + padding-left: 3px; + padding-top: 2px; + padding-bottom: 2px; + border-collapse: collapse; } -.data_table .act_as_cell{ +.data_table .act_as_cell { border: 1px solid lightGrey; text-align: center; } @@ -39,13 +39,13 @@ font-weight: bold; } .act_as_cell.left { - text-align:left; + text-align: left; } .act_as_cell.right { - text-align:right; + text-align: right; } .custom_footer { - font-size:7px !important; + font-size: 7px !important; } .button_row { padding-bottom: 10px; diff --git a/stock_card_report/static/src/js/stock_card_report_backend.js b/stock_card_report/static/src/js/stock_card_report_backend.js index 2833649..fa420a5 100644 --- a/stock_card_report/static/src/js/stock_card_report_backend.js +++ b/stock_card_report/static/src/js/stock_card_report_backend.js @@ -1,17 +1,16 @@ -odoo.define('stock_card_report.stock_card_report_backend', function (require) { - 'use strict'; - - var AbstractAction = require('web.AbstractAction'); - var core = require('web.core'); - var ReportWidget = require('web.Widget'); +odoo.define("stock_card_report.stock_card_report_backend", function (require) { + "use strict"; + var AbstractAction = require("web.AbstractAction"); + var core = require("web.core"); + var ReportWidget = require("web.Widget"); var report_backend = AbstractAction.extend({ hasControlPanel: true, // Stores all the parameters of the action. events: { - 'click .o_stock_card_reports_print': 'print', - 'click .o_stock_card_reports_export': 'export', + "click .o_stock_card_reports_print": "print", + "click .o_stock_card_reports_export": "export", }, init: function (parent, action) { this._super.apply(this, arguments); @@ -22,8 +21,8 @@ odoo.define('stock_card_report.stock_card_report_backend', function (require) { if (action.context.context) { this.given_context = action.context.context; } - this.given_context.active_id = action.context.active_id || - action.params.active_id; + this.given_context.active_id = + action.context.active_id || action.params.active_id; this.given_context.model = action.context.active_model || false; this.given_context.ttype = action.context.ttype || false; }, @@ -35,7 +34,7 @@ odoo.define('stock_card_report.stock_card_report_backend', function (require) { var def = Promise.resolve(); if (!this.report_widget) { this.report_widget = new ReportWidget(this, this.given_context); - def = this.report_widget.appendTo(this.$('.o_content')); + def = this.report_widget.appendTo(this.$(".o_content")); } def.then(function () { self.report_widget.$el.html(self.html); @@ -52,15 +51,14 @@ odoo.define('stock_card_report.stock_card_report_backend', function (require) { var defs = []; return this._rpc({ model: this.given_context.model, - method: 'get_html', + method: "get_html", args: [self.given_context], context: self.odoo_context, - }) - .then(function (result) { - self.html = result.html; - defs.push(self.update_cp()); - return $.when.apply($, defs); - }); + }).then(function (result) { + self.html = result.html; + defs.push(self.update_cp()); + return $.when.apply($, defs); + }); }, // Updates the control panel and render the elements that have yet // to be rendered @@ -81,8 +79,8 @@ odoo.define('stock_card_report.stock_card_report_backend', function (require) { var self = this; this._rpc({ model: this.given_context.model, - method: 'print_report', - args: [this.given_context.active_id, 'qweb-pdf'], + method: "print_report", + args: [this.given_context.active_id, "qweb-pdf"], context: self.odoo_context, }).then(function (result) { self.do_action(result); @@ -92,8 +90,8 @@ odoo.define('stock_card_report.stock_card_report_backend', function (require) { var self = this; this._rpc({ model: this.given_context.model, - method: 'print_report', - args: [this.given_context.active_id, 'xlsx'], + method: "print_report", + args: [this.given_context.active_id, "xlsx"], context: self.odoo_context, }).then(function (result) { self.do_action(result); @@ -104,9 +102,6 @@ odoo.define('stock_card_report.stock_card_report_backend', function (require) { }, }); - core.action_registry.add( - "stock_card_report_backend", - report_backend - ); + core.action_registry.add("stock_card_report_backend", report_backend); return report_backend; }); diff --git a/stock_card_report/wizard/stock_card_report_wizard_view.xml b/stock_card_report/wizard/stock_card_report_wizard_view.xml index f0570dc..031ff36 100644 --- a/stock_card_report/wizard/stock_card_report_wizard_view.xml +++ b/stock_card_report/wizard/stock_card_report_wizard_view.xml @@ -7,22 +7,35 @@ - - - + + + - - + + @@ -37,9 +50,11 @@ new - +