From 56523f48a67fde72a9f623168e08da242b029057 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 12 Feb 2020 16:36:58 +0100 Subject: [PATCH 01/10] [ADD] sale_report_country_state: New module --- sale_report_country_state/README.rst | 86 ++++ sale_report_country_state/__init__.py | 1 + sale_report_country_state/__manifest__.py | 18 + sale_report_country_state/i18n/es.po | 34 ++ .../i18n/sale_report_country_state.pot | 32 ++ .../i18n/sale_report_state_filter.pot | 34 ++ .../readme/CONTRIBUTORS.rst | 3 + .../readme/DESCRIPTION.rst | 1 + sale_report_country_state/readme/USAGE.rst | 7 + sale_report_country_state/reports/__init__.py | 2 + .../reports/report_all_channels_sales.py | 31 ++ .../reports/sale_report.py | 27 ++ .../reports/sale_report_views.xml | 14 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 433 ++++++++++++++++++ 15 files changed, 723 insertions(+) create mode 100644 sale_report_country_state/README.rst create mode 100644 sale_report_country_state/__init__.py create mode 100644 sale_report_country_state/__manifest__.py create mode 100644 sale_report_country_state/i18n/es.po create mode 100644 sale_report_country_state/i18n/sale_report_country_state.pot create mode 100644 sale_report_country_state/i18n/sale_report_state_filter.pot create mode 100644 sale_report_country_state/readme/CONTRIBUTORS.rst create mode 100644 sale_report_country_state/readme/DESCRIPTION.rst create mode 100644 sale_report_country_state/readme/USAGE.rst create mode 100644 sale_report_country_state/reports/__init__.py create mode 100644 sale_report_country_state/reports/report_all_channels_sales.py create mode 100644 sale_report_country_state/reports/sale_report.py create mode 100644 sale_report_country_state/reports/sale_report_views.xml create mode 100644 sale_report_country_state/static/description/icon.png create mode 100644 sale_report_country_state/static/description/index.html diff --git a/sale_report_country_state/README.rst b/sale_report_country_state/README.rst new file mode 100644 index 000000000..054694e6c --- /dev/null +++ b/sale_report_country_state/README.rst @@ -0,0 +1,86 @@ +=========================== +Sale Report Filter by State +=========================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Fsale--reporting-lightgray.png?logo=github + :target: https://github.com/OCA/sale-reporting/tree/11.0/sale_report_country_state + :alt: OCA/sale-reporting +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/sale-reporting-11-0/sale-reporting-11-0-sale_report_country_state + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/148/11.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows to filter by partner's state in the sale reports. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +To filter by state you can either: + +#. Go to *Sales > Reporting > Sales* +#. Group by *Partner's State* or filter for such criteria. + +#. Go to *Sales > Reporting > All Channels Sales Orders* +#. Filter by State. + +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 +~~~~~~~ + +* Tecnativa + +Contributors +~~~~~~~~~~~~ + +* `Tecnativa `_: + + * David Vidal + +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. + +This module is part of the `OCA/sale-reporting `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_report_country_state/__init__.py b/sale_report_country_state/__init__.py new file mode 100644 index 000000000..65323532b --- /dev/null +++ b/sale_report_country_state/__init__.py @@ -0,0 +1 @@ +from . import reports diff --git a/sale_report_country_state/__manifest__.py b/sale_report_country_state/__manifest__.py new file mode 100644 index 000000000..d799e050f --- /dev/null +++ b/sale_report_country_state/__manifest__.py @@ -0,0 +1,18 @@ +# Copyright 2020 Tecnativa - David Vidal +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +{ + "name": "Sale Report Filter by State", + "version": "11.0.1.0.0", + 'author': 'Tecnativa,' + 'Odoo Community Association (OCA)', + 'website': 'https://github.com/OCA/sale-reporting', + "category": "Sales", + "license": "AGPL-3", + "depends": [ + "sale", + ], + "data": [ + 'reports/sale_report_views.xml', + ], + "installable": True, +} diff --git a/sale_report_country_state/i18n/es.po b/sale_report_country_state/i18n/es.po new file mode 100644 index 000000000..5412849eb --- /dev/null +++ b/sale_report_country_state/i18n/es.po @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_report_country_state +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0+e\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-02-13 10:04+0000\n" +"PO-Revision-Date: 2020-02-13 10:04+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: sale_report_country_state +#: model:ir.model,name:sale_report_country_state.model_report_all_channels_sales +msgid "All sales orders grouped by sales channels" +msgstr "Todos los pedidos de venta agrupados por canal" + +#. module: sale_report_country_state +#: model:ir.model.fields,field_description:sale_report_country_state.field_report_all_channels_sales_state_id +#: model:ir.model.fields,field_description:sale_report_country_state.field_sale_report_state_id +#: model:ir.ui.view,arch_db:sale_report_country_state.view_order_product_search +msgid "Partner's State" +msgstr "Provincia de la Empresa" + +#. module: sale_report_country_state +#: model:ir.model,name:sale_report_country_state.model_sale_report +msgid "Sales Orders Statistics" +msgstr "Estadísticas de pedidos de ventas" diff --git a/sale_report_country_state/i18n/sale_report_country_state.pot b/sale_report_country_state/i18n/sale_report_country_state.pot new file mode 100644 index 000000000..f9f69bd9b --- /dev/null +++ b/sale_report_country_state/i18n/sale_report_country_state.pot @@ -0,0 +1,32 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_report_country_state +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: sale_report_country_state +#: model:ir.model,name:sale_report_country_state.model_report_all_channels_sales +msgid "All sales orders grouped by sales channels" +msgstr "" + +#. module: sale_report_country_state +#: model:ir.model.fields,field_description:sale_report_country_state.field_report_all_channels_sales_state_id +#: model:ir.model.fields,field_description:sale_report_country_state.field_sale_report_state_id +#: model:ir.ui.view,arch_db:sale_report_country_state.view_order_product_search +msgid "Partner's State" +msgstr "" + +#. module: sale_report_country_state +#: model:ir.model,name:sale_report_country_state.model_sale_report +msgid "Sales Orders Statistics" +msgstr "" + diff --git a/sale_report_country_state/i18n/sale_report_state_filter.pot b/sale_report_country_state/i18n/sale_report_state_filter.pot new file mode 100644 index 000000000..2bd948745 --- /dev/null +++ b/sale_report_country_state/i18n/sale_report_state_filter.pot @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_report_country_state +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0+e\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-02-13 10:03+0000\n" +"PO-Revision-Date: 2020-02-13 10:03+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: sale_report_country_state +#: model:ir.model,name:sale_report_country_state.model_report_all_channels_sales +msgid "All sales orders grouped by sales channels" +msgstr "" + +#. module: sale_report_country_state +#: model:ir.model.fields,field_description:sale_report_country_state.field_report_all_channels_sales_state_id +#: model:ir.model.fields,field_description:sale_report_country_state.field_sale_report_state_id +#: model:ir.ui.view,arch_db:sale_report_country_state.view_order_product_search +msgid "Partner's State" +msgstr "" + +#. module: sale_report_country_state +#: model:ir.model,name:sale_report_country_state.model_sale_report +msgid "Sales Orders Statistics" +msgstr "" + diff --git a/sale_report_country_state/readme/CONTRIBUTORS.rst b/sale_report_country_state/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..94b6ba953 --- /dev/null +++ b/sale_report_country_state/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Tecnativa `_: + + * David Vidal diff --git a/sale_report_country_state/readme/DESCRIPTION.rst b/sale_report_country_state/readme/DESCRIPTION.rst new file mode 100644 index 000000000..3fba40398 --- /dev/null +++ b/sale_report_country_state/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module allows to filter by partner's state in the sale reports. diff --git a/sale_report_country_state/readme/USAGE.rst b/sale_report_country_state/readme/USAGE.rst new file mode 100644 index 000000000..4f3753443 --- /dev/null +++ b/sale_report_country_state/readme/USAGE.rst @@ -0,0 +1,7 @@ +To filter by state you can either: + +#. Go to *Sales > Reporting > Sales* +#. Group by *Partner's State* or filter for such criteria. + +#. Go to *Sales > Reporting > All Channels Sales Orders* +#. Filter by State. diff --git a/sale_report_country_state/reports/__init__.py b/sale_report_country_state/reports/__init__.py new file mode 100644 index 000000000..873960ae3 --- /dev/null +++ b/sale_report_country_state/reports/__init__.py @@ -0,0 +1,2 @@ +from . import report_all_channels_sales +from . import sale_report diff --git a/sale_report_country_state/reports/report_all_channels_sales.py b/sale_report_country_state/reports/report_all_channels_sales.py new file mode 100644 index 000000000..3ef9d3aa4 --- /dev/null +++ b/sale_report_country_state/reports/report_all_channels_sales.py @@ -0,0 +1,31 @@ +# Copyright 2020 Tecnativa - David Vidal +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import fields, models + + +class ReportAllChannelsSales(models.Model): + _inherit = "report.all.channels.sales" + + state_id = fields.Many2one( + comodel_name="res.country.state", + string="Partner's State", + readonly=True, + ) + + def _so(self): + so_str = super()._so() + so_str = so_str.replace( + "rp.country_id AS country_id,", + """rp.country_id AS country_id, + rp.state_id AS state_id, + """, 1) + return so_str + + def get_main_request(self): + request_str = super().get_main_request() + request_str = request_str.replace( + "country_id,", + """country_id, + state_id, + """, 1) + return request_str diff --git a/sale_report_country_state/reports/sale_report.py b/sale_report_country_state/reports/sale_report.py new file mode 100644 index 000000000..f8fee4368 --- /dev/null +++ b/sale_report_country_state/reports/sale_report.py @@ -0,0 +1,27 @@ +# Copyright 2020 Tecnativa - David Vidal +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from odoo import fields, models + + +class SaleReport(models.Model): + _inherit = "sale.report" + + state_id = fields.Many2one( + comodel_name="res.country.state", + string="Partner's State", + readonly=True, + ) + + def _select(self): + select_str = super()._select() + select_str += """, + partner.state_id as state_id + """ + return select_str + + def _group_by(self): + group_by_str = super()._group_by() + group_by_str += """, + partner.state_id + """ + return group_by_str diff --git a/sale_report_country_state/reports/sale_report_views.xml b/sale_report_country_state/reports/sale_report_views.xml new file mode 100644 index 000000000..b8579325e --- /dev/null +++ b/sale_report_country_state/reports/sale_report_views.xml @@ -0,0 +1,14 @@ + + + + + sale.report + + + + + + + + + diff --git a/sale_report_country_state/static/description/icon.png b/sale_report_country_state/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/sale_report_country_state/static/description/index.html b/sale_report_country_state/static/description/index.html new file mode 100644 index 000000000..09b6dcdde --- /dev/null +++ b/sale_report_country_state/static/description/index.html @@ -0,0 +1,433 @@ + + + + + + +Sale Report Filter by State + + + +
+

Sale Report Filter by State

+ + +

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

+

This module allows to filter by partner’s state in the sale reports.

+

Table of contents

+ +
+

Usage

+

To filter by state you can either:

+
    +
  1. Go to Sales > Reporting > Sales
    2. +
  2. Group by Partner’s State or filter for such criteria.
    3. +
  3. Go to Sales > Reporting > All Channels Sales Orders
    4. +
  4. Filter by State.
    5. +
+
+
+

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

+
    +
  • Tecnativa
    • +
+
+
+

Contributors

+ +
+
+

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.

+

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

+

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

+
+
+
+ + From 93fe63641e4f5535767e2a11a92e022084cdca58 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 8 Apr 2020 11:23:07 +0200 Subject: [PATCH 02/10] [MIG] sale_report_country_state: Migration to 12.0 --- sale_report_country_state/README.rst | 10 +++---- sale_report_country_state/__manifest__.py | 2 +- sale_report_country_state/i18n/es.po | 26 ++++++++++++------- .../i18n/sale_report_country_state.pot | 18 ++++++------- .../reports/sale_report.py | 19 +++++++------- .../static/description/index.html | 6 ++--- 6 files changed, 44 insertions(+), 37 deletions(-) diff --git a/sale_report_country_state/README.rst b/sale_report_country_state/README.rst index 054694e6c..18adabe82 100644 --- a/sale_report_country_state/README.rst +++ b/sale_report_country_state/README.rst @@ -14,13 +14,13 @@ Sale Report Filter by State :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsale--reporting-lightgray.png?logo=github - :target: https://github.com/OCA/sale-reporting/tree/11.0/sale_report_country_state + :target: https://github.com/OCA/sale-reporting/tree/12.0/sale_report_country_state :alt: OCA/sale-reporting .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/sale-reporting-11-0/sale-reporting-11-0-sale_report_country_state + :target: https://translation.odoo-community.org/projects/sale-reporting-12-0/sale-reporting-12-0-sale_report_country_state :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/148/11.0 + :target: https://runbot.odoo-community.org/runbot/148/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -49,7 +49,7 @@ 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -81,6 +81,6 @@ 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. -This module is part of the `OCA/sale-reporting `_ project on GitHub. +This module is part of the `OCA/sale-reporting `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_report_country_state/__manifest__.py b/sale_report_country_state/__manifest__.py index d799e050f..2cfc7c30d 100644 --- a/sale_report_country_state/__manifest__.py +++ b/sale_report_country_state/__manifest__.py @@ -2,7 +2,7 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { "name": "Sale Report Filter by State", - "version": "11.0.1.0.0", + "version": "12.0.1.0.0", 'author': 'Tecnativa,' 'Odoo Community Association (OCA)', 'website': 'https://github.com/OCA/sale-reporting', diff --git a/sale_report_country_state/i18n/es.po b/sale_report_country_state/i18n/es.po index 5412849eb..c5d1a8fab 100644 --- a/sale_report_country_state/i18n/es.po +++ b/sale_report_country_state/i18n/es.po @@ -17,18 +17,24 @@ msgstr "" "Plural-Forms: \n" #. module: sale_report_country_state -#: model:ir.model,name:sale_report_country_state.model_report_all_channels_sales -msgid "All sales orders grouped by sales channels" -msgstr "Todos los pedidos de venta agrupados por canal" - -#. module: sale_report_country_state -#: model:ir.model.fields,field_description:sale_report_country_state.field_report_all_channels_sales_state_id -#: model:ir.model.fields,field_description:sale_report_country_state.field_sale_report_state_id -#: model:ir.ui.view,arch_db:sale_report_country_state.view_order_product_search +#: model:ir.model.fields,field_description:sale_report_country_state.field_report_all_channels_sales__state_id +#: model:ir.model.fields,field_description:sale_report_country_state.field_sale_report__state_id +#: model_terms:ir.ui.view,arch_db:sale_report_country_state.view_order_product_search msgid "Partner's State" msgstr "Provincia de la Empresa" #. module: sale_report_country_state #: model:ir.model,name:sale_report_country_state.model_sale_report -msgid "Sales Orders Statistics" -msgstr "Estadísticas de pedidos de ventas" +msgid "Sales Analysis Report" +msgstr "" + +#. module: sale_report_country_state +#: model:ir.model,name:sale_report_country_state.model_report_all_channels_sales +msgid "Sales by Channel (All in One)" +msgstr "" + +#~ msgid "All sales orders grouped by sales channels" +#~ msgstr "Todos los pedidos de venta agrupados por canal" + +#~ msgid "Sales Orders Statistics" +#~ msgstr "Estadísticas de pedidos de ventas" diff --git a/sale_report_country_state/i18n/sale_report_country_state.pot b/sale_report_country_state/i18n/sale_report_country_state.pot index f9f69bd9b..4c3c28ead 100644 --- a/sale_report_country_state/i18n/sale_report_country_state.pot +++ b/sale_report_country_state/i18n/sale_report_country_state.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" @@ -14,19 +14,19 @@ msgstr "" "Plural-Forms: \n" #. module: sale_report_country_state -#: model:ir.model,name:sale_report_country_state.model_report_all_channels_sales -msgid "All sales orders grouped by sales channels" +#: model:ir.model.fields,field_description:sale_report_country_state.field_report_all_channels_sales__state_id +#: model:ir.model.fields,field_description:sale_report_country_state.field_sale_report__state_id +#: model_terms:ir.ui.view,arch_db:sale_report_country_state.view_order_product_search +msgid "Partner's State" msgstr "" #. module: sale_report_country_state -#: model:ir.model.fields,field_description:sale_report_country_state.field_report_all_channels_sales_state_id -#: model:ir.model.fields,field_description:sale_report_country_state.field_sale_report_state_id -#: model:ir.ui.view,arch_db:sale_report_country_state.view_order_product_search -msgid "Partner's State" +#: model:ir.model,name:sale_report_country_state.model_sale_report +msgid "Sales Analysis Report" msgstr "" #. module: sale_report_country_state -#: model:ir.model,name:sale_report_country_state.model_sale_report -msgid "Sales Orders Statistics" +#: model:ir.model,name:sale_report_country_state.model_report_all_channels_sales +msgid "Sales by Channel (All in One)" msgstr "" diff --git a/sale_report_country_state/reports/sale_report.py b/sale_report_country_state/reports/sale_report.py index f8fee4368..b23ab37c8 100644 --- a/sale_report_country_state/reports/sale_report.py +++ b/sale_report_country_state/reports/sale_report.py @@ -12,16 +12,17 @@ class SaleReport(models.Model): readonly=True, ) - def _select(self): - select_str = super()._select() - select_str += """, + def _query(self, with_clause='', fields=None, groupby='', from_clause=''): + if fields is None: + fields = {} + select_str = """ , partner.state_id as state_id """ - return select_str - - def _group_by(self): - group_by_str = super()._group_by() - group_by_str += """, + fields.update({ + 'state_id': select_str, + }) + groupby += """, partner.state_id """ - return group_by_str + return super()._query(with_clause=with_clause, fields=fields, + groupby=groupby, from_clause=from_clause) diff --git a/sale_report_country_state/static/description/index.html b/sale_report_country_state/static/description/index.html index 09b6dcdde..3a139bfc4 100644 --- a/sale_report_country_state/static/description/index.html +++ b/sale_report_country_state/static/description/index.html @@ -367,7 +367,7 @@

Sale Report Filter by State

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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

+

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

This module allows to filter by partner’s state in the sale reports.

Table of contents

@@ -397,7 +397,7 @@

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.

+feedback.

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

@@ -424,7 +424,7 @@

Maintainers

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.

-

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

+

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

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

From ddd71b1b5d5596eb3f95552f1e38386a687e98dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Marques?= Date: Mon, 24 May 2021 11:33:35 +0100 Subject: [PATCH 03/10] [IMP] sale_report_country_state: black, isort, prettier --- sale_report_country_state/__manifest__.py | 13 ++++-------- .../reports/report_all_channels_sales.py | 12 ++++++----- .../reports/sale_report.py | 20 ++++++++++--------- .../reports/sale_report_views.xml | 10 +++++++--- 4 files changed, 29 insertions(+), 26 deletions(-) diff --git a/sale_report_country_state/__manifest__.py b/sale_report_country_state/__manifest__.py index 2cfc7c30d..eff2163fb 100644 --- a/sale_report_country_state/__manifest__.py +++ b/sale_report_country_state/__manifest__.py @@ -3,16 +3,11 @@ { "name": "Sale Report Filter by State", "version": "12.0.1.0.0", - 'author': 'Tecnativa,' - 'Odoo Community Association (OCA)', - 'website': 'https://github.com/OCA/sale-reporting', + "author": "Tecnativa," "Odoo Community Association (OCA)", + "website": "https://github.com/OCA/sale-reporting", "category": "Sales", "license": "AGPL-3", - "depends": [ - "sale", - ], - "data": [ - 'reports/sale_report_views.xml', - ], + "depends": ["sale",], + "data": ["reports/sale_report_views.xml",], "installable": True, } diff --git a/sale_report_country_state/reports/report_all_channels_sales.py b/sale_report_country_state/reports/report_all_channels_sales.py index 3ef9d3aa4..cf76c218c 100644 --- a/sale_report_country_state/reports/report_all_channels_sales.py +++ b/sale_report_country_state/reports/report_all_channels_sales.py @@ -7,9 +7,7 @@ class ReportAllChannelsSales(models.Model): _inherit = "report.all.channels.sales" state_id = fields.Many2one( - comodel_name="res.country.state", - string="Partner's State", - readonly=True, + comodel_name="res.country.state", string="Partner's State", readonly=True, ) def _so(self): @@ -18,7 +16,9 @@ def _so(self): "rp.country_id AS country_id,", """rp.country_id AS country_id, rp.state_id AS state_id, - """, 1) + """, + 1, + ) return so_str def get_main_request(self): @@ -27,5 +27,7 @@ def get_main_request(self): "country_id,", """country_id, state_id, - """, 1) + """, + 1, + ) return request_str diff --git a/sale_report_country_state/reports/sale_report.py b/sale_report_country_state/reports/sale_report.py index b23ab37c8..5357b8c58 100644 --- a/sale_report_country_state/reports/sale_report.py +++ b/sale_report_country_state/reports/sale_report.py @@ -7,22 +7,24 @@ class SaleReport(models.Model): _inherit = "sale.report" state_id = fields.Many2one( - comodel_name="res.country.state", - string="Partner's State", - readonly=True, + comodel_name="res.country.state", string="Partner's State", readonly=True, ) - def _query(self, with_clause='', fields=None, groupby='', from_clause=''): + def _query(self, with_clause="", fields=None, groupby="", from_clause=""): if fields is None: fields = {} select_str = """ , partner.state_id as state_id """ - fields.update({ - 'state_id': select_str, - }) + fields.update( + {"state_id": select_str,} + ) groupby += """, partner.state_id """ - return super()._query(with_clause=with_clause, fields=fields, - groupby=groupby, from_clause=from_clause) + return super()._query( + with_clause=with_clause, + fields=fields, + groupby=groupby, + from_clause=from_clause, + ) diff --git a/sale_report_country_state/reports/sale_report_views.xml b/sale_report_country_state/reports/sale_report_views.xml index b8579325e..01274a72b 100644 --- a/sale_report_country_state/reports/sale_report_views.xml +++ b/sale_report_country_state/reports/sale_report_views.xml @@ -1,12 +1,16 @@ - + sale.report - + - + From bb1c7f6fb0c8c2541f8ce130f2faefa85601e7f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Marques?= Date: Tue, 25 May 2021 10:28:32 +0100 Subject: [PATCH 04/10] [MIG] sale_report_country_state: Migration to 13.0 --- sale_report_country_state/README.rst | 31 +++++++----- sale_report_country_state/__manifest__.py | 8 +-- sale_report_country_state/i18n/es.po | 6 --- .../i18n/sale_report_country_state.pot | 9 ++-- .../readme/CONTRIBUTORS.rst | 1 + sale_report_country_state/readme/USAGE.rst | 7 +-- .../reports/report_all_channels_sales.py | 2 +- .../reports/sale_report.py | 6 +-- .../reports/sale_report_views.xml | 2 +- .../static/description/index.html | 50 ++++++++++--------- 10 files changed, 62 insertions(+), 60 deletions(-) diff --git a/sale_report_country_state/README.rst b/sale_report_country_state/README.rst index 18adabe82..2b3c1fe51 100644 --- a/sale_report_country_state/README.rst +++ b/sale_report_country_state/README.rst @@ -2,10 +2,13 @@ Sale Report Filter by State =========================== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:9e02fb75b049c67c5c8ea5c8568518f0cfda572512d24c8d8aba6372b872fc2b + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -14,16 +17,16 @@ Sale Report Filter by State :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsale--reporting-lightgray.png?logo=github - :target: https://github.com/OCA/sale-reporting/tree/12.0/sale_report_country_state + :target: https://github.com/OCA/sale-reporting/tree/13.0/sale_report_country_state :alt: OCA/sale-reporting .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/sale-reporting-12-0/sale-reporting-12-0-sale_report_country_state + :target: https://translation.odoo-community.org/projects/sale-reporting-13-0/sale-reporting-13-0-sale_report_country_state :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/148/12.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/sale-reporting&target_branch=13.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This module allows to filter by partner's state in the sale reports. @@ -38,18 +41,19 @@ Usage To filter by state you can either: #. Go to *Sales > Reporting > Sales* -#. Group by *Partner's State* or filter for such criteria. +#. Group by *Customer State* or filter for such criteria. -#. Go to *Sales > Reporting > All Channels Sales Orders* -#. Filter by State. +#. Go to *Sales > Products > Products* and select a product. +#. Press the sales analysis smart button at the top. +#. Filter or group by the *Customer State* 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 `_. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -67,6 +71,7 @@ Contributors * `Tecnativa `_: * David Vidal + * João Marques Maintainers ~~~~~~~~~~~ @@ -81,6 +86,6 @@ 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. -This module is part of the `OCA/sale-reporting `_ project on GitHub. +This module is part of the `OCA/sale-reporting `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_report_country_state/__manifest__.py b/sale_report_country_state/__manifest__.py index eff2163fb..9f0cd7114 100644 --- a/sale_report_country_state/__manifest__.py +++ b/sale_report_country_state/__manifest__.py @@ -2,12 +2,12 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { "name": "Sale Report Filter by State", - "version": "12.0.1.0.0", - "author": "Tecnativa," "Odoo Community Association (OCA)", + "version": "13.0.1.0.0", + "author": "Tecnativa, Odoo Community Association (OCA)", "website": "https://github.com/OCA/sale-reporting", "category": "Sales", "license": "AGPL-3", - "depends": ["sale",], - "data": ["reports/sale_report_views.xml",], + "depends": ["sale"], + "data": ["reports/sale_report_views.xml"], "installable": True, } diff --git a/sale_report_country_state/i18n/es.po b/sale_report_country_state/i18n/es.po index c5d1a8fab..c27f8ab31 100644 --- a/sale_report_country_state/i18n/es.po +++ b/sale_report_country_state/i18n/es.po @@ -32,9 +32,3 @@ msgstr "" #: model:ir.model,name:sale_report_country_state.model_report_all_channels_sales msgid "Sales by Channel (All in One)" msgstr "" - -#~ msgid "All sales orders grouped by sales channels" -#~ msgstr "Todos los pedidos de venta agrupados por canal" - -#~ msgid "Sales Orders Statistics" -#~ msgstr "Estadísticas de pedidos de ventas" diff --git a/sale_report_country_state/i18n/sale_report_country_state.pot b/sale_report_country_state/i18n/sale_report_country_state.pot index 4c3c28ead..c5a3dbad7 100644 --- a/sale_report_country_state/i18n/sale_report_country_state.pot +++ b/sale_report_country_state/i18n/sale_report_country_state.pot @@ -1,12 +1,12 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * sale_report_country_state +# * sale_report_country_state # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" +"Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: <>\n" +"Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,7 +17,7 @@ msgstr "" #: model:ir.model.fields,field_description:sale_report_country_state.field_report_all_channels_sales__state_id #: model:ir.model.fields,field_description:sale_report_country_state.field_sale_report__state_id #: model_terms:ir.ui.view,arch_db:sale_report_country_state.view_order_product_search -msgid "Partner's State" +msgid "Customer State" msgstr "" #. module: sale_report_country_state @@ -29,4 +29,3 @@ msgstr "" #: model:ir.model,name:sale_report_country_state.model_report_all_channels_sales msgid "Sales by Channel (All in One)" msgstr "" - diff --git a/sale_report_country_state/readme/CONTRIBUTORS.rst b/sale_report_country_state/readme/CONTRIBUTORS.rst index 94b6ba953..b2a0dfc72 100644 --- a/sale_report_country_state/readme/CONTRIBUTORS.rst +++ b/sale_report_country_state/readme/CONTRIBUTORS.rst @@ -1,3 +1,4 @@ * `Tecnativa `_: * David Vidal + * João Marques diff --git a/sale_report_country_state/readme/USAGE.rst b/sale_report_country_state/readme/USAGE.rst index 4f3753443..0c6592f11 100644 --- a/sale_report_country_state/readme/USAGE.rst +++ b/sale_report_country_state/readme/USAGE.rst @@ -1,7 +1,8 @@ To filter by state you can either: #. Go to *Sales > Reporting > Sales* -#. Group by *Partner's State* or filter for such criteria. +#. Group by *Customer State* or filter for such criteria. -#. Go to *Sales > Reporting > All Channels Sales Orders* -#. Filter by State. +#. Go to *Sales > Products > Products* and select a product. +#. Press the sales analysis smart button at the top. +#. Filter or group by the *Customer State* diff --git a/sale_report_country_state/reports/report_all_channels_sales.py b/sale_report_country_state/reports/report_all_channels_sales.py index cf76c218c..551d17ead 100644 --- a/sale_report_country_state/reports/report_all_channels_sales.py +++ b/sale_report_country_state/reports/report_all_channels_sales.py @@ -7,7 +7,7 @@ class ReportAllChannelsSales(models.Model): _inherit = "report.all.channels.sales" state_id = fields.Many2one( - comodel_name="res.country.state", string="Partner's State", readonly=True, + comodel_name="res.country.state", string="Customer State", readonly=True, ) def _so(self): diff --git a/sale_report_country_state/reports/sale_report.py b/sale_report_country_state/reports/sale_report.py index 5357b8c58..fd9cf001b 100644 --- a/sale_report_country_state/reports/sale_report.py +++ b/sale_report_country_state/reports/sale_report.py @@ -7,7 +7,7 @@ class SaleReport(models.Model): _inherit = "sale.report" state_id = fields.Many2one( - comodel_name="res.country.state", string="Partner's State", readonly=True, + comodel_name="res.country.state", string="Customer State", readonly=True, ) def _query(self, with_clause="", fields=None, groupby="", from_clause=""): @@ -16,9 +16,7 @@ def _query(self, with_clause="", fields=None, groupby="", from_clause=""): select_str = """ , partner.state_id as state_id """ - fields.update( - {"state_id": select_str,} - ) + fields.update({"state_id": select_str}) groupby += """, partner.state_id """ diff --git a/sale_report_country_state/reports/sale_report_views.xml b/sale_report_country_state/reports/sale_report_views.xml index 01274a72b..ebc9443ad 100644 --- a/sale_report_country_state/reports/sale_report_views.xml +++ b/sale_report_country_state/reports/sale_report_views.xml @@ -7,7 +7,7 @@ diff --git a/sale_report_country_state/static/description/index.html b/sale_report_country_state/static/description/index.html index 3a139bfc4..7ad33a1c7 100644 --- a/sale_report_country_state/static/description/index.html +++ b/sale_report_country_state/static/description/index.html @@ -1,20 +1,20 @@ - + - + Sale Report Filter by State