From 912fc102cc1eea1391d75e4b193c3ab5d73a8d78 Mon Sep 17 00:00:00 2001 From: Bhavesh Odedra Date: Thu, 17 Oct 2019 18:35:41 +0530 Subject: [PATCH 1/4] [11.0][ADD] Batch report printing --- report_batch/README.rst | 132 ++++++ report_batch/__init__.py | 5 + report_batch/__manifest__.py | 22 + report_batch/models/__init__.py | 5 + report_batch/models/ir_action_report.py | 103 +++++ report_batch/readme/CONFIGURE.rst | 17 + report_batch/readme/CONTRIBUTORS.rst | 3 + report_batch/readme/CREDITS.rst | 3 + report_batch/readme/DESCRIPTION.rst | 3 + report_batch/readme/ROADMAP.rst | 0 report_batch/readme/USAGE.rst | 15 + report_batch/security/ir.model.access.csv | 3 + report_batch/static/description/icon.png | Bin 0 -> 9455 bytes report_batch/static/description/index.html | 456 +++++++++++++++++++ report_batch/views/ir_action_report_view.xml | 50 ++ 15 files changed, 817 insertions(+) create mode 100644 report_batch/README.rst create mode 100644 report_batch/__init__.py create mode 100644 report_batch/__manifest__.py create mode 100644 report_batch/models/__init__.py create mode 100644 report_batch/models/ir_action_report.py create mode 100644 report_batch/readme/CONFIGURE.rst create mode 100644 report_batch/readme/CONTRIBUTORS.rst create mode 100644 report_batch/readme/CREDITS.rst create mode 100644 report_batch/readme/DESCRIPTION.rst create mode 100644 report_batch/readme/ROADMAP.rst create mode 100644 report_batch/readme/USAGE.rst create mode 100644 report_batch/security/ir.model.access.csv create mode 100644 report_batch/static/description/icon.png create mode 100644 report_batch/static/description/index.html create mode 100644 report_batch/views/ir_action_report_view.xml diff --git a/report_batch/README.rst b/report_batch/README.rst new file mode 100644 index 000000000..afb521322 --- /dev/null +++ b/report_batch/README.rst @@ -0,0 +1,132 @@ +===================== +Batch Report Printing +===================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github + :target: https://github.com/OCA/reporting-engine/tree/11.0/report_batch + :alt: OCA/reporting-engine +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/reporting-engine-11-0/reporting-engine-11-0-report_batch + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/143/11.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module will allow to to print multiple QWeb reports in a single batch. +For example, picking, packing, reports needs to be printed together +in a single batch. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +We can configure this module in following two ways: + +1st Way +======= + +* Create a Report or edit existing report from Settings > Users & Companies > + Batch Reports +* Add sequence number and select parent report or design your own batch report. +* Select subreport to add reports and save it. + +2st Way +======= + +* Active developer mode. Go to Settings > Technical > Actions > Reports. +* Create or edit report and select related model. +* Jump on "Batch report" tab and add subreport one by one. +* Drag up and down and arrange a sequence of report. Save it. + +Usage +===== + +If we configure it like following values: + +* Name = Picking Batch Report +* Model = Transfer +* Template Name = my.picking_batch_report +* Add subreport = Delivery Slip and Picking Operations +* Save it. + +To get results: + +* Go to Inventory > Operations > Transfers +* Open one record or select multi records. +* Click on "Print" option near by "Action". +* Print "Picking Batch Report" +* We will get delivery slip and picking operations report together. + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Open Source Integrators + +Contributors +~~~~~~~~~~~~ + +* Bhavesh Odedra +* Balaji Kannan +* Daniel Reis + +Other credits +~~~~~~~~~~~~~ + +The development of this module has been financially supported by: + +* Open Source Integrators + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +.. |maintainer-bodedra| image:: https://github.com/bodedra.png?size=40px + :target: https://github.com/bodedra + :alt: bodedra + +Current `maintainer `__: + +|maintainer-bodedra| + +This module is part of the `OCA/reporting-engine `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/report_batch/__init__.py b/report_batch/__init__.py new file mode 100644 index 000000000..f1ef2417f --- /dev/null +++ b/report_batch/__init__.py @@ -0,0 +1,5 @@ +# Copyright (C) 2019 IBM Corp. +# Copyright (C) 2019 Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import models diff --git a/report_batch/__manifest__.py b/report_batch/__manifest__.py new file mode 100644 index 000000000..3446028b3 --- /dev/null +++ b/report_batch/__manifest__.py @@ -0,0 +1,22 @@ +# Copyright (C) 2019 IBM Corp. +# Copyright (C) 2019 Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + 'name': 'Batch Report Printing', + 'summary': 'Ability to print multiple QWeb reports in a single batch.', + 'version': '11.0.1.0.0', + 'license': 'AGPL-3', + 'author': 'Open Source Integrators, Odoo Community Association (OCA)', + 'category': 'Reporting', + 'website': 'http://www.opensourceintegrators.com', + 'depends': [ + 'stock', + ], + 'data': [ + 'security/ir.model.access.csv', + 'views/ir_action_report_view.xml', + ], + 'installable': True, + 'maintainers': ['bodedra'], +} diff --git a/report_batch/models/__init__.py b/report_batch/models/__init__.py new file mode 100644 index 000000000..95d1c5045 --- /dev/null +++ b/report_batch/models/__init__.py @@ -0,0 +1,5 @@ +# Copyright (C) 2019 IBM Corp. +# Copyright (C) 2019 Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import ir_action_report diff --git a/report_batch/models/ir_action_report.py b/report_batch/models/ir_action_report.py new file mode 100644 index 000000000..00d64db27 --- /dev/null +++ b/report_batch/models/ir_action_report.py @@ -0,0 +1,103 @@ +# Copyright (C) 2019 IBM Corp. +# Copyright (C) 2019 Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models +import random + + +class IrActionsReportSubreport(models.Model): + _name = 'ir.actions.report.subreport' + _description = 'Report Subreport' + _order = 'sequence' + + parent_report_id = fields.Many2one('ir.actions.report', ondelete='cascade') + sequence = fields.Integer(default=10) + model = fields.Char(related='parent_report_id.model') + subreport_id = fields.Many2one( + 'ir.actions.report', string='Subreport', required=True) + + +class IrActionsReport(models.Model): + _inherit = 'ir.actions.report' + + subreport_ids = fields.One2many( + 'ir.actions.report.subreport', 'parent_report_id') + model_id = fields.Many2one('ir.model', string='Model') + + @api.onchange('model_id') + def onchange_model_id(self): + if self.model_id: + self.model = self.model_id.model + + def generate_top_part(self): + return """\n\t\n\t + """ % self.report_name + + def generate_bottom_part(self): + return """\n + \t\t\n\t\t""" + + def generate_custom_content(self, report_name): + return """\n + \t""" % report_name + + def _generate_batch_qweb_report(self, update_batch_qweb=False): + report_name = self.report_name + if '.' in report_name: + module = self.report_name.split('.')[0] + report_name = self.report_name.split('.')[1] + else: + # Generate random number to avoid IntegrityError + module = random.randint(1, 1000000) + self.report_name = "%s.%s" % (module, report_name) + if self.subreport_ids: + if update_batch_qweb: + report_name = self.report_name.split('.')[1] + # Delete old Qweb batch report + model_data = self.env['ir.model.data'].search( + [('res_id', '=', self.id)]) + model_data.unlink() + ui_view = self.env['ir.ui.view'].search( + [('name', '=', report_name)]) + ui_view.unlink() + template_header = self.generate_top_part() + template_footer = self.generate_bottom_part() + template_content = '' + + for subreport in self.subreport_ids: + template_content += self.generate_custom_content( + subreport.subreport_id.report_name + ) + data = "%s%s%s" % ( + template_header, template_content, template_footer) + ui_view = self.env['ir.ui.view'].create( + {'name': report_name, + 'type': 'qweb', + 'model': self.model, + 'mode': 'primary', + 'arch_base': data}) + self.env['ir.model.data'].create( + {'module': module, + 'name': report_name, + 'res_id': ui_view.id, + 'model': 'ir.ui.view'}) + # Register batch report option + if not self.binding_model_id: + self.create_action() + return True + + @api.model + def create(self, vals): + res = super(IrActionsReport, self).create(vals) + for report in res: + report._generate_batch_qweb_report() + return res + + @api.multi + def write(self, vals): + res = super(IrActionsReport, self).write(vals) + if 'subreport_ids' in vals or 'model' in vals: + for report in self: + report._generate_batch_qweb_report(update_batch_qweb=True) + return res diff --git a/report_batch/readme/CONFIGURE.rst b/report_batch/readme/CONFIGURE.rst new file mode 100644 index 000000000..d936942ab --- /dev/null +++ b/report_batch/readme/CONFIGURE.rst @@ -0,0 +1,17 @@ +We can configure this module in following two ways: + +1st Way +======= + +* Create a Report or edit existing report from Settings > Users & Companies > + Batch Reports +* Add sequence number and select parent report or design your own batch report. +* Select subreport to add reports and save it. + +2st Way +======= + +* Active developer mode. Go to Settings > Technical > Actions > Reports. +* Create or edit report and select related model. +* Jump on "Batch report" tab and add subreport one by one. +* Drag up and down and arrange a sequence of report. Save it. diff --git a/report_batch/readme/CONTRIBUTORS.rst b/report_batch/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..910e80b9a --- /dev/null +++ b/report_batch/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* Bhavesh Odedra +* Balaji Kannan +* Daniel Reis diff --git a/report_batch/readme/CREDITS.rst b/report_batch/readme/CREDITS.rst new file mode 100644 index 000000000..8209266d9 --- /dev/null +++ b/report_batch/readme/CREDITS.rst @@ -0,0 +1,3 @@ +The development of this module has been financially supported by: + +* Open Source Integrators diff --git a/report_batch/readme/DESCRIPTION.rst b/report_batch/readme/DESCRIPTION.rst new file mode 100644 index 000000000..6010b45e6 --- /dev/null +++ b/report_batch/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +This module will allow to to print multiple QWeb reports in a single batch. +For example, picking, packing, reports needs to be printed together +in a single batch. diff --git a/report_batch/readme/ROADMAP.rst b/report_batch/readme/ROADMAP.rst new file mode 100644 index 000000000..e69de29bb diff --git a/report_batch/readme/USAGE.rst b/report_batch/readme/USAGE.rst new file mode 100644 index 000000000..fbcd85bf1 --- /dev/null +++ b/report_batch/readme/USAGE.rst @@ -0,0 +1,15 @@ +If we configure it like following values: + +* Name = Picking Batch Report +* Model = Transfer +* Template Name = my.picking_batch_report +* Add subreport = Delivery Slip and Picking Operations +* Save it. + +To get results: + +* Go to Inventory > Operations > Transfers +* Open one record or select multi records. +* Click on "Print" option near by "Action". +* Print "Picking Batch Report" +* We will get delivery slip and picking operations report together. diff --git a/report_batch/security/ir.model.access.csv b/report_batch/security/ir.model.access.csv new file mode 100644 index 000000000..59dcd473b --- /dev/null +++ b/report_batch/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_ir_actions_subreport_all,ir_actions_report_subreport,model_ir_actions_report_subreport,,1,0,0,0 +access_ir_actions_subreport_group_system,ir_actions_report_subreport_group_system,model_ir_actions_report_subreport,base.group_system,1,1,1,1 diff --git a/report_batch/static/description/icon.png b/report_batch/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 zcmW++2RxMjAAjx~&dlBk9S+%}OXg)AGE&Cb*&}d0jUxM@u(PQx^-s)697TX`ehR4?GS^qbkof1cslKgkU)h65qZ9Oc=ml_0temigYLJfnz{IDzUf>bGs4N!v3=Z3jMq&A#7%rM5eQ#dc?k~! zVpnB`o+K7|Al`Q_U;eD$B zfJtP*jH`siUq~{KE)`jP2|#TUEFGRryE2`i0**z#*^6~AI|YzIWy$Cu#CSLW3q=GA z6`?GZymC;dCPk~rBS%eCb`5OLr;RUZ;D`}um=H)BfVIq%7VhiMr)_#G0N#zrNH|__ zc+blN2UAB0=617@>_u;MPHN;P;N#YoE=)R#i$k_`UAA>WWCcEVMh~L_ zj--gtp&|K1#58Yz*AHCTMziU1Jzt_jG0I@qAOHsk$2}yTmVkBp_eHuY$A9)>P6o~I z%aQ?!(GqeQ-Y+b0I(m9pwgi(IIZZzsbMv+9w{PFtd_<_(LA~0H(xz{=FhLB@(1&qHA5EJw1>>=%q2f&^X>IQ{!GJ4e9U z&KlB)z(84HmNgm2hg2C0>WM{E(DdPr+EeU_N@57;PC2&DmGFW_9kP&%?X4}+xWi)( z;)z%wI5>D4a*5XwD)P--sPkoY(a~WBw;E~AW`Yue4kFa^LM3X`8x|}ZUeMnqr}>kH zG%WWW>3ml$Yez?i%)2pbKPI7?5o?hydokgQyZsNEr{a|mLdt;X2TX(#B1j35xPnPW z*bMSSOauW>o;*=kO8ojw91VX!qoOQb)zHJ!odWB}d+*K?#sY_jqPdg{Sm2HdYzdEx zOGVPhVRTGPtv0o}RfVP;Nd(|CB)I;*t&QO8h zFfekr30S!-LHmV_Su-W+rEwYXJ^;6&3|L$mMC8*bQptyOo9;>Qb9Q9`ySe3%V$A*9 zeKEe+b0{#KWGp$F+tga)0RtI)nhMa-K@JS}2krK~n8vJ=Ngm?R!9G<~RyuU0d?nz# z-5EK$o(!F?hmX*2Yt6+coY`6jGbb7tF#6nHA zuKk=GGJ;ZwON1iAfG$E#Y7MnZVmrY|j0eVI(DN_MNFJmyZ|;w4tf@=CCDZ#5N_0K= z$;R~bbk?}TpfDjfB&aiQ$VA}s?P}xPERJG{kxk5~R`iRS(SK5d+Xs9swCozZISbnS zk!)I0>t=A<-^z(cmSFz3=jZ23u13X><0b)P)^1T_))Kr`e!-pb#q&J*Q`p+B6la%C zuVl&0duN<;uOsB3%T9Fp8t{ED108<+W(nOZd?gDnfNBC3>M8WE61$So|P zVvqH0SNtDTcsUdzaMDpT=Ty0pDHHNL@Z0w$Y`XO z2M-_r1S+GaH%pz#Uy0*w$Vdl=X=rQXEzO}d6J^R6zjM1u&c9vYLvLp?W7w(?np9x1 zE_0JSAJCPB%i7p*Wvg)pn5T`8k3-uR?*NT|J`eS#_#54p>!p(mLDvmc-3o0mX*mp_ zN*AeS<>#^-{S%W<*mz^!X$w_2dHWpcJ6^j64qFBft-o}o_Vx80o0>}Du;>kLts;$8 zC`7q$QI(dKYG`Wa8#wl@V4jVWBRGQ@1dr-hstpQL)Tl+aqVpGpbSfN>5i&QMXfiZ> zaA?T1VGe?rpQ@;+pkrVdd{klI&jVS@I5_iz!=UMpTsa~mBga?1r}aRBm1WS;TT*s0f0lY=JBl66Upy)-k4J}lh=P^8(SXk~0xW=T9v*B|gzIhN z>qsO7dFd~mgxAy4V?&)=5ieYq?zi?ZEoj)&2o)RLy=@hbCRcfT5jigwtQGE{L*8<@Yd{zg;CsL5mvzfDY}P-wos_6PfprFVaeqNE%h zKZhLtcQld;ZD+>=nqN~>GvROfueSzJD&BE*}XfU|H&(FssBqY=hPCt`d zH?@s2>I(|;fcW&YM6#V#!kUIP8$Nkdh0A(bEVj``-AAyYgwY~jB zT|I7Bf@%;7aL7Wf4dZ%VqF$eiaC38OV6oy3Z#TER2G+fOCd9Iaoy6aLYbPTN{XRPz z;U!V|vBf%H!}52L2gH_+j;`bTcQRXB+y9onc^wLm5wi3-Be}U>k_u>2Eg$=k!(l@I zcCg+flakT2Nej3i0yn+g+}%NYb?ta;R?(g5SnwsQ49U8Wng8d|{B+lyRcEDvR3+`O{zfmrmvFrL6acVP%yG98X zo&+VBg@px@i)%o?dG(`T;n*$S5*rnyiR#=wW}}GsAcfyQpE|>a{=$Hjg=-*_K;UtD z#z-)AXwSRY?OPefw^iI+ z)AXz#PfEjlwTes|_{sB?4(O@fg0AJ^g8gP}ex9Ucf*@_^J(s_5jJV}c)s$`Myn|Kd z$6>}#q^n{4vN@+Os$m7KV+`}c%4)4pv@06af4-x5#wj!KKb%caK{A&Y#Rfs z-po?Dcb1({W=6FKIUirH&(yg=*6aLCekcKwyfK^JN5{wcA3nhO(o}SK#!CINhI`-I z1)6&n7O&ZmyFMuNwvEic#IiOAwNkR=u5it{B9n2sAJV5pNhar=j5`*N!Na;c7g!l$ z3aYBqUkqqTJ=Re-;)s!EOeij=7SQZ3Hq}ZRds%IM*PtM$wV z@;rlc*NRK7i3y5BETSKuumEN`Xu_8GP1Ri=OKQ$@I^ko8>H6)4rjiG5{VBM>B|%`&&s^)jS|-_95&yc=GqjNo{zFkw%%HHhS~e=s zD#sfS+-?*t|J!+ozP6KvtOl!R)@@-z24}`9{QaVLD^9VCSR2b`b!KC#o;Ki<+wXB6 zx3&O0LOWcg4&rv4QG0)4yb}7BFSEg~=IR5#ZRj8kg}dS7_V&^%#Do==#`u zpy6{ox?jWuR(;pg+f@mT>#HGWHAJRRDDDv~@(IDw&R>9643kK#HN`!1vBJHnC+RM&yIh8{gG2q zA%e*U3|N0XSRa~oX-3EAneep)@{h2vvd3Xvy$7og(sayr@95+e6~Xvi1tUqnIxoIH zVWo*OwYElb#uyW{Imam6f2rGbjR!Y3`#gPqkv57dB6K^wRGxc9B(t|aYDGS=m$&S!NmCtrMMaUg(c zc2qC=2Z`EEFMW-me5B)24AqF*bV5Dr-M5ig(l-WPS%CgaPzs6p_gnCIvTJ=Y<6!gT zVt@AfYCzjjsMEGi=rDQHo0yc;HqoRNnNFeWZgcm?f;cp(6CNylj36DoL(?TS7eU#+ z7&mfr#y))+CJOXQKUMZ7QIdS9@#-}7y2K1{8)cCt0~-X0O!O?Qx#E4Og+;A2SjalQ zs7r?qn0H044=sDN$SRG$arw~n=+T_DNdSrarmu)V6@|?1-ZB#hRn`uilTGPJ@fqEy zGt(f0B+^JDP&f=r{#Y_wi#AVDf-y!RIXU^0jXsFpf>=Ji*TeqSY!H~AMbJdCGLhC) zn7Rx+sXw6uYj;WRYrLd^5IZq@6JI1C^YkgnedZEYy<&4(z%Q$5yv#Boo{AH8n$a zhb4Y3PWdr269&?V%uI$xMcUrMzl=;w<_nm*qr=c3Rl@i5wWB;e-`t7D&c-mcQl7x! zZWB`UGcw=Y2=}~wzrfLx=uet<;m3~=8I~ZRuzvMQUQdr+yTV|ATf1Uuomr__nDf=X zZ3WYJtHp_ri(}SQAPjv+Y+0=fH4krOP@S&=zZ-t1jW1o@}z;xk8 z(Nz1co&El^HK^NrhVHa-_;&88vTU>_J33=%{if;BEY*J#1n59=07jrGQ#IP>@u#3A z;!q+E1Rj3ZJ+!4bq9F8PXJ@yMgZL;>&gYA0%_Kbi8?S=XGM~dnQZQ!yBSgcZhY96H zrWnU;k)qy`rX&&xlDyA%(a1Hhi5CWkmg(`Gb%m(HKi-7Z!LKGRP_B8@`7&hdDy5n= z`OIxqxiVfX@OX1p(mQu>0Ai*v_cTMiw4qRt3~NBvr9oBy0)r>w3p~V0SCm=An6@3n)>@z!|o-$HvDK z|3D2ZMJkLE5loMKl6R^ez@Zz%S$&mbeoqH5`Bb){Ei21q&VP)hWS2tjShfFtGE+$z zzCR$P#uktu+#!w)cX!lWN1XU%K-r=s{|j?)Akf@q#3b#{6cZCuJ~gCxuMXRmI$nGtnH+-h z+GEi!*X=AP<|fG`1>MBdTb?28JYc=fGvAi2I<$B(rs$;eoJCyR6_bc~p!XR@O-+sD z=eH`-ye})I5ic1eL~TDmtfJ|8`0VJ*Yr=hNCd)G1p2MMz4C3^Mj?7;!w|Ly%JqmuW zlIEW^Ft%z?*|fpXda>Jr^1noFZEwFgVV%|*XhH@acv8rdGxeEX{M$(vG{Zw+x(ei@ zmfXb22}8-?Fi`vo-YVrTH*C?a8%M=Hv9MqVH7H^J$KsD?>!SFZ;ZsvnHr_gn=7acz z#W?0eCdVhVMWN12VV^$>WlQ?f;P^{(&pYTops|btm6aj>_Uz+hqpGwB)vWp0Cf5y< zft8-je~nn?W11plq}N)4A{l8I7$!ks_x$PXW-2XaRFswX_BnF{R#6YIwMhAgd5F9X zGmwdadS6(a^fjHtXg8=l?Rc0Sm%hk6E9!5cLVloEy4eh(=FwgP`)~I^5~pBEWo+F6 zSf2ncyMurJN91#cJTy_u8Y}@%!bq1RkGC~-bV@SXRd4F{R-*V`bS+6;W5vZ(&+I<9$;-V|eNfLa5n-6% z2(}&uGRF;p92eS*sE*oR$@pexaqr*meB)VhmIg@h{uzkk$9~qh#cHhw#>O%)b@+(| z^IQgqzuj~Sk(J;swEM-3TrJAPCq9k^^^`q{IItKBRXYe}e0Tdr=Huf7da3$l4PdpwWDop%^}n;dD#K4s#DYA8SHZ z&1!riV4W4R7R#C))JH1~axJ)RYnM$$lIR%6fIVA@zV{XVyx}C+a-Dt8Y9M)^KU0+H zR4IUb2CJ{Hg>CuaXtD50jB(_Tcx=Z$^WYu2u5kubqmwp%drJ6 z?Fo40g!Qd<-l=TQxqHEOuPX0;^z7iX?Ke^a%XT<13TA^5`4Xcw6D@Ur&VT&CUe0d} z1GjOVF1^L@>O)l@?bD~$wzgf(nxX1OGD8fEV?TdJcZc2KoUe|oP1#=$$7ee|xbY)A zDZq+cuTpc(fFdj^=!;{k03C69lMQ(|>uhRfRu%+!k&YOi-3|1QKB z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/report_batch/static/description/index.html b/report_batch/static/description/index.html new file mode 100644 index 000000000..6bb7e054f --- /dev/null +++ b/report_batch/static/description/index.html @@ -0,0 +1,456 @@ + + + + + + +Batch Report Printing + + + +
+

Batch Report Printing

+ + +

Beta License: AGPL-3 OCA/reporting-engine Translate me on Weblate Try me on Runbot

+

This module will allow to to print multiple QWeb reports in a single batch. +For example, picking, packing, reports needs to be printed together +in a single batch.

+

Table of contents

+ +
+

Configuration

+

We can configure this module in following two ways:

+
+
+

1st Way

+
    +
  • Create a Report or edit existing report from Settings > Users & Companies > +Batch Reports
  • +
  • Add sequence number and select parent report or design your own batch report.
  • +
  • Select subreport to add reports and save it.
  • +
+
+
+

2st Way

+
    +
  • Active developer mode. Go to Settings > Technical > Actions > Reports.
  • +
  • Create or edit report and select related model.
  • +
  • Jump on “Batch report” tab and add subreport one by one.
  • +
  • Drag up and down and arrange a sequence of report. Save it.
  • +
+
+
+

Usage

+

If we configure it like following values:

+
    +
  • Name = Picking Batch Report
  • +
  • Model = Transfer
  • +
  • Template Name = my.picking_batch_report
  • +
  • Add subreport = Delivery Slip and Picking Operations
  • +
  • Save it.
  • +
+

To get results:

+
    +
  • Go to Inventory > Operations > Transfers
  • +
  • Open one record or select multi records.
  • +
  • Click on “Print” option near by “Action”.
  • +
  • Print “Picking Batch Report”
  • +
  • We will get delivery slip and picking operations report together.
  • +
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Open Source Integrators
  • +
+
+ +
+

Other credits

+

The development of this module has been financially supported by:

+
    +
  • Open Source Integrators
  • +
+
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

Current maintainer:

+

bodedra

+

This module is part of the OCA/reporting-engine project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/report_batch/views/ir_action_report_view.xml b/report_batch/views/ir_action_report_view.xml new file mode 100644 index 000000000..71b42619a --- /dev/null +++ b/report_batch/views/ir_action_report_view.xml @@ -0,0 +1,50 @@ + + + + ir.actions.batch.report.form + ir.actions.report + + + + + + + + + + + + + + + + + + + + ir.actions.report.subreport.tree + ir.actions.report.subreport + + + + + + + + + + + + Batch Reports + ir.actions.act_window + ir.actions.report.subreport + form + Allows to add multi QWeb reports in a single batch + + + + + From 45d3686a7b15adb5b664f6ee25fb47554a3c38ee Mon Sep 17 00:00:00 2001 From: Bhavesh Odedra Date: Mon, 13 Apr 2020 11:17:00 +0530 Subject: [PATCH 2/4] [IMP] report_batch: black, isort, prettier --- report_batch/__manifest__.py | 27 +++--- report_batch/models/ir_action_report.py | 92 +++++++++++--------- report_batch/views/ir_action_report_view.xml | 35 ++++---- 3 files changed, 81 insertions(+), 73 deletions(-) diff --git a/report_batch/__manifest__.py b/report_batch/__manifest__.py index 3446028b3..419ff1cc1 100644 --- a/report_batch/__manifest__.py +++ b/report_batch/__manifest__.py @@ -3,20 +3,15 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { - 'name': 'Batch Report Printing', - 'summary': 'Ability to print multiple QWeb reports in a single batch.', - 'version': '11.0.1.0.0', - 'license': 'AGPL-3', - 'author': 'Open Source Integrators, Odoo Community Association (OCA)', - 'category': 'Reporting', - 'website': 'http://www.opensourceintegrators.com', - 'depends': [ - 'stock', - ], - 'data': [ - 'security/ir.model.access.csv', - 'views/ir_action_report_view.xml', - ], - 'installable': True, - 'maintainers': ['bodedra'], + "name": "Batch Report Printing", + "summary": "Ability to print multiple QWeb reports in a single batch.", + "version": "11.0.1.0.0", + "license": "AGPL-3", + "author": "Open Source Integrators, Odoo Community Association (OCA)", + "category": "Reporting", + "website": "http://www.opensourceintegrators.com", + "depends": ["stock",], + "data": ["security/ir.model.access.csv", "views/ir_action_report_view.xml",], + "installable": True, + "maintainers": ["bodedra"], } diff --git a/report_batch/models/ir_action_report.py b/report_batch/models/ir_action_report.py index 00d64db27..a3511251e 100644 --- a/report_batch/models/ir_action_report.py +++ b/report_batch/models/ir_action_report.py @@ -2,86 +2,98 @@ # Copyright (C) 2019 Open Source Integrators # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import api, fields, models import random +from odoo import api, fields, models + class IrActionsReportSubreport(models.Model): - _name = 'ir.actions.report.subreport' - _description = 'Report Subreport' - _order = 'sequence' + _name = "ir.actions.report.subreport" + _description = "Report Subreport" + _order = "sequence" - parent_report_id = fields.Many2one('ir.actions.report', ondelete='cascade') + parent_report_id = fields.Many2one("ir.actions.report", ondelete="cascade") sequence = fields.Integer(default=10) - model = fields.Char(related='parent_report_id.model') + model = fields.Char(related="parent_report_id.model") subreport_id = fields.Many2one( - 'ir.actions.report', string='Subreport', required=True) + "ir.actions.report", string="Subreport", required=True + ) class IrActionsReport(models.Model): - _inherit = 'ir.actions.report' + _inherit = "ir.actions.report" - subreport_ids = fields.One2many( - 'ir.actions.report.subreport', 'parent_report_id') - model_id = fields.Many2one('ir.model', string='Model') + subreport_ids = fields.One2many("ir.actions.report.subreport", "parent_report_id") + model_id = fields.Many2one("ir.model", string="Model") - @api.onchange('model_id') + @api.onchange("model_id") def onchange_model_id(self): if self.model_id: self.model = self.model_id.model def generate_top_part(self): - return """\n\t\n\t - """ % self.report_name + return ( + """\n\t\n\t + """ + % self.report_name + ) def generate_bottom_part(self): return """\n \t\t\n\t\t""" def generate_custom_content(self, report_name): - return """\n - \t""" % report_name + return ( + """\n + \t""" + % report_name + ) def _generate_batch_qweb_report(self, update_batch_qweb=False): report_name = self.report_name - if '.' in report_name: - module = self.report_name.split('.')[0] - report_name = self.report_name.split('.')[1] + if "." in report_name: + module = self.report_name.split(".")[0] + report_name = self.report_name.split(".")[1] else: # Generate random number to avoid IntegrityError module = random.randint(1, 1000000) - self.report_name = "%s.%s" % (module, report_name) + self.report_name = "{}.{}".format(module, report_name) if self.subreport_ids: if update_batch_qweb: - report_name = self.report_name.split('.')[1] + report_name = self.report_name.split(".")[1] # Delete old Qweb batch report - model_data = self.env['ir.model.data'].search( - [('res_id', '=', self.id)]) + model_data = self.env["ir.model.data"].search( + [("res_id", "=", self.id)] + ) model_data.unlink() - ui_view = self.env['ir.ui.view'].search( - [('name', '=', report_name)]) + ui_view = self.env["ir.ui.view"].search([("name", "=", report_name)]) ui_view.unlink() template_header = self.generate_top_part() template_footer = self.generate_bottom_part() - template_content = '' + template_content = "" for subreport in self.subreport_ids: template_content += self.generate_custom_content( subreport.subreport_id.report_name ) - data = "%s%s%s" % ( - template_header, template_content, template_footer) - ui_view = self.env['ir.ui.view'].create( - {'name': report_name, - 'type': 'qweb', - 'model': self.model, - 'mode': 'primary', - 'arch_base': data}) - self.env['ir.model.data'].create( - {'module': module, - 'name': report_name, - 'res_id': ui_view.id, - 'model': 'ir.ui.view'}) + data = "{}{}{}".format(template_header, template_content, template_footer) + ui_view = self.env["ir.ui.view"].create( + { + "name": report_name, + "type": "qweb", + "model": self.model, + "mode": "primary", + "arch_base": data, + } + ) + self.env["ir.model.data"].create( + { + "module": module, + "name": report_name, + "res_id": ui_view.id, + "model": "ir.ui.view", + } + ) # Register batch report option if not self.binding_model_id: self.create_action() @@ -97,7 +109,7 @@ class IrActionsReport(models.Model): @api.multi def write(self, vals): res = super(IrActionsReport, self).write(vals) - if 'subreport_ids' in vals or 'model' in vals: + if "subreport_ids" in vals or "model" in vals: for report in self: report._generate_batch_qweb_report(update_batch_qweb=True) return res diff --git a/report_batch/views/ir_action_report_view.xml b/report_batch/views/ir_action_report_view.xml index 71b42619a..fa1828077 100644 --- a/report_batch/views/ir_action_report_view.xml +++ b/report_batch/views/ir_action_report_view.xml @@ -1,39 +1,40 @@ - + ir.actions.batch.report.form ir.actions.report - + - + - - + + - ir.actions.report.subreport.tree ir.actions.report.subreport - - - - + + + + - Batch Reports ir.actions.act_window @@ -41,10 +42,10 @@ form Allows to add multi QWeb reports in a single batch - - - + From 57a1916a20efa8cce60c126235fabcb4921771fa Mon Sep 17 00:00:00 2001 From: Bhavesh Odedra Date: Mon, 13 Apr 2020 11:18:24 +0530 Subject: [PATCH 3/4] [13.0][MIG] report_batch --- report_batch/__manifest__.py | 6 +++--- report_batch/models/ir_action_report.py | 1 - report_batch/views/ir_action_report_view.xml | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/report_batch/__manifest__.py b/report_batch/__manifest__.py index 419ff1cc1..87f77b724 100644 --- a/report_batch/__manifest__.py +++ b/report_batch/__manifest__.py @@ -5,13 +5,13 @@ { "name": "Batch Report Printing", "summary": "Ability to print multiple QWeb reports in a single batch.", - "version": "11.0.1.0.0", + "version": "13.0.1.0.0", "license": "AGPL-3", "author": "Open Source Integrators, Odoo Community Association (OCA)", "category": "Reporting", "website": "http://www.opensourceintegrators.com", - "depends": ["stock",], - "data": ["security/ir.model.access.csv", "views/ir_action_report_view.xml",], + "depends": ["stock"], + "data": ["security/ir.model.access.csv", "views/ir_action_report_view.xml"], "installable": True, "maintainers": ["bodedra"], } diff --git a/report_batch/models/ir_action_report.py b/report_batch/models/ir_action_report.py index a3511251e..7945e988a 100644 --- a/report_batch/models/ir_action_report.py +++ b/report_batch/models/ir_action_report.py @@ -106,7 +106,6 @@ class IrActionsReport(models.Model): report._generate_batch_qweb_report() return res - @api.multi def write(self, vals): res = super(IrActionsReport, self).write(vals) if "subreport_ids" in vals or "model" in vals: diff --git a/report_batch/views/ir_action_report_view.xml b/report_batch/views/ir_action_report_view.xml index fa1828077..aedc27a02 100644 --- a/report_batch/views/ir_action_report_view.xml +++ b/report_batch/views/ir_action_report_view.xml @@ -39,7 +39,6 @@ Batch Reports ir.actions.act_window ir.actions.report.subreport - form Allows to add multi QWeb reports in a single batch Date: Mon, 13 Apr 2020 12:54:05 +0530 Subject: [PATCH 4/4] [ADD] test cases --- report_batch/__manifest__.py | 2 +- report_batch/models/ir_action_report.py | 6 ----- report_batch/readme/ROADMAP.rst | 0 report_batch/tests/__init__.py | 5 ++++ report_batch/tests/test_report_batch.py | 36 +++++++++++++++++++++++++ 5 files changed, 42 insertions(+), 7 deletions(-) delete mode 100644 report_batch/readme/ROADMAP.rst create mode 100644 report_batch/tests/__init__.py create mode 100644 report_batch/tests/test_report_batch.py diff --git a/report_batch/__manifest__.py b/report_batch/__manifest__.py index 87f77b724..dd191a7a9 100644 --- a/report_batch/__manifest__.py +++ b/report_batch/__manifest__.py @@ -9,7 +9,7 @@ "license": "AGPL-3", "author": "Open Source Integrators, Odoo Community Association (OCA)", "category": "Reporting", - "website": "http://www.opensourceintegrators.com", + "website": "https://github.com/OCA/reporting-engine", "depends": ["stock"], "data": ["security/ir.model.access.csv", "views/ir_action_report_view.xml"], "installable": True, diff --git a/report_batch/models/ir_action_report.py b/report_batch/models/ir_action_report.py index 7945e988a..710f3e3ec 100644 --- a/report_batch/models/ir_action_report.py +++ b/report_batch/models/ir_action_report.py @@ -24,12 +24,6 @@ class IrActionsReport(models.Model): _inherit = "ir.actions.report" subreport_ids = fields.One2many("ir.actions.report.subreport", "parent_report_id") - model_id = fields.Many2one("ir.model", string="Model") - - @api.onchange("model_id") - def onchange_model_id(self): - if self.model_id: - self.model = self.model_id.model def generate_top_part(self): return ( diff --git a/report_batch/readme/ROADMAP.rst b/report_batch/readme/ROADMAP.rst deleted file mode 100644 index e69de29bb..000000000 diff --git a/report_batch/tests/__init__.py b/report_batch/tests/__init__.py new file mode 100644 index 000000000..b3bef7e31 --- /dev/null +++ b/report_batch/tests/__init__.py @@ -0,0 +1,5 @@ +# Copyright (C) 2020 IBM Corp. +# Copyright (C) 2020 Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import test_report_batch diff --git a/report_batch/tests/test_report_batch.py b/report_batch/tests/test_report_batch.py new file mode 100644 index 000000000..ee9a9f437 --- /dev/null +++ b/report_batch/tests/test_report_batch.py @@ -0,0 +1,36 @@ +# Copyright (C) 2019 IBM Corp. +# Copyright (C) 2019 Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +import odoo.tests.common as test_common + + +class TestReportBatch(test_common.SingleTransactionCase): + def setUp(self): + super(TestReportBatch, self).setUp() + self.report_picking_operations = self.env.ref("stock.action_report_picking") + self.report_deliveryslip = self.env.ref("stock.report_deliveryslip") + + def test_report_batch(self): + report_batch = self.env["ir.actions.report"].create( + { + "name": "Batch Report", + "report_type": "qweb-pdf", + "model": "stock.picking", + "report_name": "my_custom_batch_report", + } + ) + report_batch.write( + { + "subreport_ids": [ + ( + 6, + 0, + [ + self.report_picking_operations.id, + self.report_deliveryslip.id, + ], + ) + ] + } + )