From f55f9858889858576d1be2c47cc14d70816076a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Pigeon?= Date: Fri, 14 Sep 2018 16:23:37 +0200 Subject: [PATCH 01/56] [ADD] add new module to display discount amount on sale orders --- sale_discount_display_amount/README.rst | 1 + sale_discount_display_amount/__init__.py | 3 + sale_discount_display_amount/__manifest__.py | 22 ++++++++ sale_discount_display_amount/hooks.py | 53 ++++++++++++++++++ .../models/__init__.py | 2 + .../models/sale_order.py | 32 +++++++++++ .../models/sale_order_line.py | 48 ++++++++++++++++ .../readme/CONFIGURE.rst | 3 + .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 4 ++ sale_discount_display_amount/readme/USAGE.rst | 6 ++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../tests/__init__.py | 1 + .../tests/test_discount_display_amount.py | 31 ++++++++++ .../views/sale_view.xml | 17 ++++++ 15 files changed, 224 insertions(+) create mode 100644 sale_discount_display_amount/README.rst create mode 100644 sale_discount_display_amount/__init__.py create mode 100644 sale_discount_display_amount/__manifest__.py create mode 100644 sale_discount_display_amount/hooks.py create mode 100644 sale_discount_display_amount/models/__init__.py create mode 100644 sale_discount_display_amount/models/sale_order.py create mode 100644 sale_discount_display_amount/models/sale_order_line.py create mode 100644 sale_discount_display_amount/readme/CONFIGURE.rst create mode 100644 sale_discount_display_amount/readme/CONTRIBUTORS.rst create mode 100644 sale_discount_display_amount/readme/DESCRIPTION.rst create mode 100644 sale_discount_display_amount/readme/USAGE.rst create mode 100644 sale_discount_display_amount/static/description/icon.png create mode 100644 sale_discount_display_amount/tests/__init__.py create mode 100644 sale_discount_display_amount/tests/test_discount_display_amount.py create mode 100644 sale_discount_display_amount/views/sale_view.xml diff --git a/sale_discount_display_amount/README.rst b/sale_discount_display_amount/README.rst new file mode 100644 index 00000000000..d7f8f00abe2 --- /dev/null +++ b/sale_discount_display_amount/README.rst @@ -0,0 +1 @@ +This file is going to be generated by oca-gen-addon-readme. diff --git a/sale_discount_display_amount/__init__.py b/sale_discount_display_amount/__init__.py new file mode 100644 index 00000000000..f84dcd0429d --- /dev/null +++ b/sale_discount_display_amount/__init__.py @@ -0,0 +1,3 @@ +from . import models +from .hooks import pre_init_hook +from .hooks import post_init_hook diff --git a/sale_discount_display_amount/__manifest__.py b/sale_discount_display_amount/__manifest__.py new file mode 100644 index 00000000000..f565caa0fb7 --- /dev/null +++ b/sale_discount_display_amount/__manifest__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2018 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + 'name': 'Sale Discount Display Amount', + 'summary': """ + This addon intends to display the amount of the discount computed on + sale_order_line and sale_order level""", + 'version': '10.0.1.0.0', + 'license': 'AGPL-3', + 'author': 'ACSONE SA/NV,Odoo Community Association (OCA)', + 'website': 'http://www.acsone.eu', + 'depends': [ + 'sale' + ], + 'data': [ + 'views/sale_view.xml' + ], + 'pre_init_hook': 'pre_init_hook', + 'post_init_hook': 'post_init_hook', +} diff --git a/sale_discount_display_amount/hooks.py b/sale_discount_display_amount/hooks.py new file mode 100644 index 00000000000..47bcbb59409 --- /dev/null +++ b/sale_discount_display_amount/hooks.py @@ -0,0 +1,53 @@ +# -*- coding: utf-8 -*- +# Copyright 2018 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +import logging +from odoo.api import Environment +from odoo import SUPERUSER_ID + +_logger = logging.getLogger(__name__) + + +def pre_init_hook(cr): + _logger.info("Create discount columns in database") + cr.execute(""" + ALTER TABLE sale_order ADD COLUMN price_total_no_discount numeric; + """) + cr.execute(""" + ALTER TABLE sale_order ADD COLUMN discount_total numeric; + """) + cr.execute(""" + ALTER TABLE sale_order_line ADD COLUMN price_total_no_discount + numeric; + """) + cr.execute(""" + ALTER TABLE sale_order_line ADD COLUMN discount_total numeric; + """) + + +def post_init_hook(cr, registry): + _logger.info("Compute discount columns") + env = Environment(cr, SUPERUSER_ID, {}) + + query = """ + update sale_order_line + set price_total_no_discount = price_total + where discount = 0.0 + """ + cr.execute(query) + + query = """ + update sale_order + set price_total_no_discount = amount_total + """ + cr.execute(query) + + query = """ + select distinct order_id from sale_order_line where discount > 0.0; + """ + + cr.execute(query) + order_ids = cr.fetchall() + + orders = env['sale.order'].search([('id', 'in', order_ids)]) + orders.mapped('order_line')._compute_discount() diff --git a/sale_discount_display_amount/models/__init__.py b/sale_discount_display_amount/models/__init__.py new file mode 100644 index 00000000000..2d7ee6c3dc7 --- /dev/null +++ b/sale_discount_display_amount/models/__init__.py @@ -0,0 +1,2 @@ +from . import sale_order +from . import sale_order_line diff --git a/sale_discount_display_amount/models/sale_order.py b/sale_discount_display_amount/models/sale_order.py new file mode 100644 index 00000000000..3ec95d460d1 --- /dev/null +++ b/sale_discount_display_amount/models/sale_order.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +# Copyright 2018 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models + + +class SaleOrder(models.Model): + + _inherit = 'sale.order' + + discount_total = fields.Monetary( + compute='_compute_discount', + string='Discount Subtotal', + readonly=True, + store=True) + price_total_no_discount = fields.Monetary( + compute='_compute_discount', + string='Subtotal Without Discount', + readonly=True, + store=True) + + @api.depends('order_line.discount_total', 'order_line.discount_total') + def _compute_discount(self): + for order in self: + discount_total = sum(order.order_line.mapped('discount_total')) + price_total_no_discount = sum( + order.order_line.mapped('price_total_no_discount')) + order.update({ + 'discount_total': discount_total, + 'price_total_no_discount': price_total_no_discount + }) diff --git a/sale_discount_display_amount/models/sale_order_line.py b/sale_discount_display_amount/models/sale_order_line.py new file mode 100644 index 00000000000..9958e07a1a5 --- /dev/null +++ b/sale_discount_display_amount/models/sale_order_line.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- +# Copyright 2018 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models + + +class SaleOrderLine(models.Model): + + _inherit = 'sale.order.line' + + discount_total = fields.Monetary( + compute='_compute_amount', + string='Discount Subtotal', + readonly=True, + store=True) + price_total_no_discount = fields.Monetary( + compute='_compute_amount', + string='Subtotal Without Discount', + readonly=True, + store=True) + + def _compute_discount(self): + for line in self: + if not line.discount: + line.price_total_no_discount = line.price_total + continue + price = line.price_unit + taxes = line.tax_id.compute_all( + price, + line.order_id.currency_id, + line.product_uom_qty, + product=line.product_id, + partner=line.order_id.partner_shipping_id) + + price_total_no_discount = taxes['total_included'] + discount_total = price_total_no_discount - line.price_total + + line.update({ + 'discount_total': discount_total, + 'price_total_no_discount': price_total_no_discount + }) + + @api.depends('product_uom_qty', 'discount', 'price_unit', 'tax_id') + def _compute_amount(self): + res = super(SaleOrderLine, self)._compute_amount() + self._compute_discount() + return res diff --git a/sale_discount_display_amount/readme/CONFIGURE.rst b/sale_discount_display_amount/readme/CONFIGURE.rst new file mode 100644 index 00000000000..3f8ee007107 --- /dev/null +++ b/sale_discount_display_amount/readme/CONFIGURE.rst @@ -0,0 +1,3 @@ +To configure this module, you need to: + +#. Go to Sales/Settings and check "Allow discounts on sales order lines" diff --git a/sale_discount_display_amount/readme/CONTRIBUTORS.rst b/sale_discount_display_amount/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000000..4771f843212 --- /dev/null +++ b/sale_discount_display_amount/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Cédric Pigeon diff --git a/sale_discount_display_amount/readme/DESCRIPTION.rst b/sale_discount_display_amount/readme/DESCRIPTION.rst new file mode 100644 index 00000000000..d3a9483050b --- /dev/null +++ b/sale_discount_display_amount/readme/DESCRIPTION.rst @@ -0,0 +1,4 @@ +In standard Odoo only display the rate of the discount applied, never the +amount. It could be great to be able to tell the customer how much he spares. +This is the goal of this addons, it will show on a sale +order the total without the discount and the value of the discount. diff --git a/sale_discount_display_amount/readme/USAGE.rst b/sale_discount_display_amount/readme/USAGE.rst new file mode 100644 index 00000000000..a06c81b1a8c --- /dev/null +++ b/sale_discount_display_amount/readme/USAGE.rst @@ -0,0 +1,6 @@ + +To use this module, you need to: + +#. Go on a sale order +#. Set a discount on a line +#. The value of the discount is dislayed in the total section as well as the total without it. diff --git a/sale_discount_display_amount/static/description/icon.png b/sale_discount_display_amount/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_discount_display_amount/tests/__init__.py b/sale_discount_display_amount/tests/__init__.py new file mode 100644 index 00000000000..b1f57a33cd5 --- /dev/null +++ b/sale_discount_display_amount/tests/__init__.py @@ -0,0 +1 @@ +from . import test_discount_display_amount diff --git a/sale_discount_display_amount/tests/test_discount_display_amount.py b/sale_discount_display_amount/tests/test_discount_display_amount.py new file mode 100644 index 00000000000..4c8ee1ac239 --- /dev/null +++ b/sale_discount_display_amount/tests/test_discount_display_amount.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +# Copyright 2018 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests.common import TransactionCase + + +class TestDiscountDisplay(TransactionCase): + + def test_sale_discount_value(self): + product1 = self.env['product.product'].create( + {'name': 'Product TEST', + 'type': 'consu'}) + customer = self.env['res.partner'].create( + {"name": "Customer TEST", + "is_company": False, + "email": "test@tes.ttest"}) + so = self.env["sale.order"].create( + {"partner_id": customer.id}) + self.env['sale.order.line'].create( + {'order_id': so.id, + 'product_id': product1.id, + 'price_unit': 30.75}) + + first_line = so.order_line[0] + first_line.discount = 10 + + self.assertAlmostEqual(first_line.price_total_no_discount, 35.36) + self.assertAlmostEqual(first_line.discount_total, 3.53) + self.assertAlmostEqual(so.discount_total, 3.53) + self.assertAlmostEqual(so.price_total_no_discount, 35.36) diff --git a/sale_discount_display_amount/views/sale_view.xml b/sale_discount_display_amount/views/sale_view.xml new file mode 100644 index 00000000000..2878a71f7de --- /dev/null +++ b/sale_discount_display_amount/views/sale_view.xml @@ -0,0 +1,17 @@ + + + + sale.order.form (abi_sale) + sale.order + + 99 + + + + + + + + + + From 8b567025ec5b749e70fc637951891074707f43d5 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Tue, 18 Sep 2018 10:20:16 +0000 Subject: [PATCH 02/56] [UPD] Update sale_discount_display_amount.pot --- .../i18n/sale_discount_display_amount.pot | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 sale_discount_display_amount/i18n/sale_discount_display_amount.pot diff --git a/sale_discount_display_amount/i18n/sale_discount_display_amount.pot b/sale_discount_display_amount/i18n/sale_discount_display_amount.pot new file mode 100644 index 00000000000..c59cc3c56b3 --- /dev/null +++ b/sale_discount_display_amount/i18n/sale_discount_display_amount.pot @@ -0,0 +1,37 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_discount_display_amount +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.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_discount_display_amount +#: model:ir.model.fields,field_description:sale_discount_display_amount.field_sale_order_discount_total +#: model:ir.model.fields,field_description:sale_discount_display_amount.field_sale_order_line_discount_total +msgid "Discount Subtotal" +msgstr "" + +#. module: sale_discount_display_amount +#: model:ir.model,name:sale_discount_display_amount.model_sale_order +msgid "Sales Order" +msgstr "" + +#. module: sale_discount_display_amount +#: model:ir.model,name:sale_discount_display_amount.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: sale_discount_display_amount +#: model:ir.model.fields,field_description:sale_discount_display_amount.field_sale_order_line_price_total_no_discount +#: model:ir.model.fields,field_description:sale_discount_display_amount.field_sale_order_price_total_no_discount +msgid "Subtotal Without Discount" +msgstr "" + From fb8b84afc3a8c48b5af8ab37832f87e90c55635a Mon Sep 17 00:00:00 2001 From: OCA Git Bot Date: Wed, 19 Sep 2018 05:26:12 +0200 Subject: [PATCH 03/56] [UPD] README.rst --- sale_discount_display_amount/README.rst | 94 +++- .../static/description/index.html | 440 ++++++++++++++++++ 2 files changed, 533 insertions(+), 1 deletion(-) create mode 100644 sale_discount_display_amount/static/description/index.html diff --git a/sale_discount_display_amount/README.rst b/sale_discount_display_amount/README.rst index d7f8f00abe2..2300611b449 100644 --- a/sale_discount_display_amount/README.rst +++ b/sale_discount_display_amount/README.rst @@ -1 +1,93 @@ -This file is going to be generated by oca-gen-addon-readme. +============================ +Sale Discount Display Amount +============================ + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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--workflow-lightgray.png?logo=github + :target: https://github.com/OCA/sale-workflow/tree/10.0/sale_discount_display_amount + :alt: OCA/sale-workflow +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/sale-workflow-10-0/sale-workflow-10-0-sale_discount_display_amount + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/167/10.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +In standard Odoo only display the rate of the discount applied, never the +amount. It could be great to be able to tell the customer how much he spares. +This is the goal of this addons, it will show on a sale +order the total without the discount and the value of the discount. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +To configure this module, you need to: + +#. Go to Sales/Settings and check "Allow discounts on sales order lines" + +Usage +===== + + +To use this module, you need to: + +#. Go on a sale order +#. Set a discount on a line +#. The value of the discount is dislayed in the total section as well as the total without it. + +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 +~~~~~~~ + +* ACSONE SA/NV + +Contributors +~~~~~~~~~~~~ + +* Cédric Pigeon + +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-workflow `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_discount_display_amount/static/description/index.html b/sale_discount_display_amount/static/description/index.html new file mode 100644 index 00000000000..7ec10cc46c6 --- /dev/null +++ b/sale_discount_display_amount/static/description/index.html @@ -0,0 +1,440 @@ + + + + + + +Sale Discount Display Amount + + + +
+

Sale Discount Display Amount

+ + +

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

+

In standard Odoo only display the rate of the discount applied, never the +amount. It could be great to be able to tell the customer how much he spares. +This is the goal of this addons, it will show on a sale +order the total without the discount and the value of the discount.

+

Table of contents

+ +
+

Configuration

+

To configure this module, you need to:

+
    +
  1. Go to Sales/Settings and check “Allow discounts on sales order lines”
    2. +
+
+
+

Usage

+

To use this module, you need to:

+
    +
  1. Go on a sale order
    2. +
  2. Set a discount on a line
    3. +
  3. The value of the discount is dislayed in the total section as well as the total without it.
    4. +
+
+
+

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

+
    +
  • ACSONE SA/NV
    • +
+
+
+

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-workflow project on GitHub.

+

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

+
+
+
+ + From ca0773a3a40f4265f6e4297a2c9eb2e02c63642e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Pigeon=20=28ACSONE=29?= Date: Wed, 10 Oct 2018 12:35:29 +0000 Subject: [PATCH 04/56] Added translation using Weblate (French) --- sale_discount_display_amount/i18n/fr.po | 39 +++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 sale_discount_display_amount/i18n/fr.po diff --git a/sale_discount_display_amount/i18n/fr.po b/sale_discount_display_amount/i18n/fr.po new file mode 100644 index 00000000000..a0d02d3e056 --- /dev/null +++ b/sale_discount_display_amount/i18n/fr.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_discount_display_amount +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2018-10-10 12:38+0000\n" +"Last-Translator: Cédric Pigeon (ACSONE) \n" +"Language-Team: none\n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 3.1.1\n" + +#. module: sale_discount_display_amount +#: model:ir.model.fields,field_description:sale_discount_display_amount.field_sale_order_discount_total +#: model:ir.model.fields,field_description:sale_discount_display_amount.field_sale_order_line_discount_total +msgid "Discount Subtotal" +msgstr "Montant de la remise" + +#. module: sale_discount_display_amount +#: model:ir.model,name:sale_discount_display_amount.model_sale_order +msgid "Sales Order" +msgstr "Bons de commande" + +#. module: sale_discount_display_amount +#: model:ir.model,name:sale_discount_display_amount.model_sale_order_line +msgid "Sales Order Line" +msgstr "Lignes de bon de commande" + +#. module: sale_discount_display_amount +#: model:ir.model.fields,field_description:sale_discount_display_amount.field_sale_order_line_price_total_no_discount +#: model:ir.model.fields,field_description:sale_discount_display_amount.field_sale_order_price_total_no_discount +msgid "Subtotal Without Discount" +msgstr "Sous-total sans la remise" From 3436e5e8bd1633e32b63c432bfb01dd138f4a7b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Pigeon=20=28ACSONE=29?= Date: Wed, 10 Oct 2018 12:35:36 +0000 Subject: [PATCH 05/56] Added translation using Weblate (Spanish) --- sale_discount_display_amount/i18n/es.po | 39 ++++++++++++++++++++++ sale_discount_display_amount/i18n/es_ES.po | 37 ++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 sale_discount_display_amount/i18n/es.po create mode 100644 sale_discount_display_amount/i18n/es_ES.po diff --git a/sale_discount_display_amount/i18n/es.po b/sale_discount_display_amount/i18n/es.po new file mode 100644 index 00000000000..14990491751 --- /dev/null +++ b/sale_discount_display_amount/i18n/es.po @@ -0,0 +1,39 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_discount_display_amount +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2018-10-10 12:47+0000\n" +"Last-Translator: Cédric Pigeon (ACSONE) \n" +"Language-Team: none\n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 3.1.1\n" + +#. module: sale_discount_display_amount +#: model:ir.model.fields,field_description:sale_discount_display_amount.field_sale_order_discount_total +#: model:ir.model.fields,field_description:sale_discount_display_amount.field_sale_order_line_discount_total +msgid "Discount Subtotal" +msgstr "Descuento total" + +#. module: sale_discount_display_amount +#: model:ir.model,name:sale_discount_display_amount.model_sale_order +msgid "Sales Order" +msgstr "Pedido de venta" + +#. module: sale_discount_display_amount +#: model:ir.model,name:sale_discount_display_amount.model_sale_order_line +msgid "Sales Order Line" +msgstr "Línea pedido de venta" + +#. module: sale_discount_display_amount +#: model:ir.model.fields,field_description:sale_discount_display_amount.field_sale_order_line_price_total_no_discount +#: model:ir.model.fields,field_description:sale_discount_display_amount.field_sale_order_price_total_no_discount +msgid "Subtotal Without Discount" +msgstr "Total Sin Descuento" diff --git a/sale_discount_display_amount/i18n/es_ES.po b/sale_discount_display_amount/i18n/es_ES.po new file mode 100644 index 00000000000..8a0ca4ffe98 --- /dev/null +++ b/sale_discount_display_amount/i18n/es_ES.po @@ -0,0 +1,37 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_discount_display_amount +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_ES\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. module: sale_discount_display_amount +#: model:ir.model.fields,field_description:sale_discount_display_amount.field_sale_order_discount_total +#: model:ir.model.fields,field_description:sale_discount_display_amount.field_sale_order_line_discount_total +msgid "Discount Subtotal" +msgstr "" + +#. module: sale_discount_display_amount +#: model:ir.model,name:sale_discount_display_amount.model_sale_order +msgid "Sales Order" +msgstr "" + +#. module: sale_discount_display_amount +#: model:ir.model,name:sale_discount_display_amount.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: sale_discount_display_amount +#: model:ir.model.fields,field_description:sale_discount_display_amount.field_sale_order_line_price_total_no_discount +#: model:ir.model.fields,field_description:sale_discount_display_amount.field_sale_order_price_total_no_discount +msgid "Subtotal Without Discount" +msgstr "" From 98d6dd02ebdb1387955047fdd954a1aea397642f Mon Sep 17 00:00:00 2001 From: Abraham Anes Date: Thu, 4 Apr 2019 20:57:19 +0200 Subject: [PATCH 06/56] [12.0][MIG] sale_discount_display_amount --- sale_discount_display_amount/README.rst | 11 +++--- sale_discount_display_amount/__manifest__.py | 7 ++-- sale_discount_display_amount/hooks.py | 1 - .../models/sale_order.py | 8 ++-- .../models/sale_order_line.py | 3 -- .../readme/CONTRIBUTORS.rst | 1 + .../static/description/index.html | 37 ++++--------------- .../tests/test_discount_display_amount.py | 1 - .../views/sale_view.xml | 4 +- 9 files changed, 24 insertions(+), 49 deletions(-) diff --git a/sale_discount_display_amount/README.rst b/sale_discount_display_amount/README.rst index 2300611b449..a17b5ea350e 100644 --- a/sale_discount_display_amount/README.rst +++ b/sale_discount_display_amount/README.rst @@ -14,13 +14,13 @@ Sale Discount Display Amount :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--workflow-lightgray.png?logo=github - :target: https://github.com/OCA/sale-workflow/tree/10.0/sale_discount_display_amount + :target: https://github.com/OCA/sale-workflow/tree/12.0/sale_discount_display_amount :alt: OCA/sale-workflow .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/sale-workflow-10-0/sale-workflow-10-0-sale_discount_display_amount + :target: https://translation.odoo-community.org/projects/sale-workflow-12-0/sale-workflow-12-0-sale_discount_display_amount :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/167/10.0 + :target: https://runbot.odoo-community.org/runbot/167/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -58,7 +58,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. @@ -74,6 +74,7 @@ Contributors ~~~~~~~~~~~~ * Cédric Pigeon +* Abraham Anes Maintainers ~~~~~~~~~~~ @@ -88,6 +89,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-workflow `_ project on GitHub. +This module is part of the `OCA/sale-workflow `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_discount_display_amount/__manifest__.py b/sale_discount_display_amount/__manifest__.py index f565caa0fb7..b5b2ef32ae5 100644 --- a/sale_discount_display_amount/__manifest__.py +++ b/sale_discount_display_amount/__manifest__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2018 ACSONE SA/NV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). @@ -7,12 +6,12 @@ 'summary': """ This addon intends to display the amount of the discount computed on sale_order_line and sale_order level""", - 'version': '10.0.1.0.0', + 'version': '12.0.1.0.0', 'license': 'AGPL-3', 'author': 'ACSONE SA/NV,Odoo Community Association (OCA)', - 'website': 'http://www.acsone.eu', + 'website': 'https://github.com/OCA/sale-workflow', 'depends': [ - 'sale' + 'sale_management' ], 'data': [ 'views/sale_view.xml' diff --git a/sale_discount_display_amount/hooks.py b/sale_discount_display_amount/hooks.py index 47bcbb59409..35582e2c851 100644 --- a/sale_discount_display_amount/hooks.py +++ b/sale_discount_display_amount/hooks.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2018 ACSONE SA/NV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). import logging diff --git a/sale_discount_display_amount/models/sale_order.py b/sale_discount_display_amount/models/sale_order.py index 3ec95d460d1..7876dff1fd2 100644 --- a/sale_discount_display_amount/models/sale_order.py +++ b/sale_discount_display_amount/models/sale_order.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2018 ACSONE SA/NV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). @@ -12,15 +11,16 @@ class SaleOrder(models.Model): discount_total = fields.Monetary( compute='_compute_discount', string='Discount Subtotal', - readonly=True, + currency_field='currency_id', store=True) price_total_no_discount = fields.Monetary( compute='_compute_discount', string='Subtotal Without Discount', - readonly=True, + currency_field='currency_id', store=True) - @api.depends('order_line.discount_total', 'order_line.discount_total') + @api.depends('order_line.discount_total', + 'order_line.price_total_no_discount') def _compute_discount(self): for order in self: discount_total = sum(order.order_line.mapped('discount_total')) diff --git a/sale_discount_display_amount/models/sale_order_line.py b/sale_discount_display_amount/models/sale_order_line.py index 9958e07a1a5..83378a71344 100644 --- a/sale_discount_display_amount/models/sale_order_line.py +++ b/sale_discount_display_amount/models/sale_order_line.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2018 ACSONE SA/NV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). @@ -12,12 +11,10 @@ class SaleOrderLine(models.Model): discount_total = fields.Monetary( compute='_compute_amount', string='Discount Subtotal', - readonly=True, store=True) price_total_no_discount = fields.Monetary( compute='_compute_amount', string='Subtotal Without Discount', - readonly=True, store=True) def _compute_discount(self): diff --git a/sale_discount_display_amount/readme/CONTRIBUTORS.rst b/sale_discount_display_amount/readme/CONTRIBUTORS.rst index 4771f843212..124a6f41298 100644 --- a/sale_discount_display_amount/readme/CONTRIBUTORS.rst +++ b/sale_discount_display_amount/readme/CONTRIBUTORS.rst @@ -1 +1,2 @@ * Cédric Pigeon +* Abraham Anes diff --git a/sale_discount_display_amount/static/description/index.html b/sale_discount_display_amount/static/description/index.html index 7ec10cc46c6..eae3dfea295 100644 --- a/sale_discount_display_amount/static/description/index.html +++ b/sale_discount_display_amount/static/description/index.html @@ -3,13 +3,13 @@ - + Sale Discount Display Amount - - -
-

Sale Discount Display Amount

- - -

Beta License: AGPL-3 OCA/sale-workflow Translate me on Weblate Try me on Runboat

-

In standard Odoo only display the rate of the discount applied, never the -amount. It could be great to be able to tell the customer how much he spares. -This is the goal of this addons, it will show on a sale -order the total without the discount and the value of the discount.

-

Table of contents

- -
-

Configuration

-

To configure this module, you need to:

-
    -
  1. Go to Sales/Settings and check “Allow discounts on sales order lines”
    2. -
-
-
-

Usage

-

To use this module, you need to:

-
    -
  1. Go on a sale order
    2. -
  2. Set a discount on a line
    3. -
  3. The value of the discount is dislayed in the total section as well as the total without it.
    4. -
-
-
-

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 to smash it by providing a detailed and welcomed -feedback.

-

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

-
-
-

Credits

-
-

Authors

-
    -
  • ACSONE SA/NV
    • -
-
-
-

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-workflow project on GitHub.

-

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

-
-
-
- + p.label { + white-space: nowrap } + + p.rubric { + font-weight: bold ; + font-size: larger ; + color: maroon ; + text-align: center } + + p.sidebar-title { + font-family: sans-serif ; + font-weight: bold ; + font-size: larger } + + p.sidebar-subtitle { + font-family: sans-serif ; + font-weight: bold } + + p.topic-title { + font-weight: bold } + + pre.address { + margin-bottom: 0 ; + margin-top: 0 ; + font: inherit } + + pre.literal-block, pre.doctest-block, pre.math, pre.code { + margin-left: 2em ; + margin-right: 2em } + + pre.code .ln { color: grey; } /* line numbers */ + pre.code, code { background-color: #eeeeee } + pre.code .comment, code .comment { color: #5C6576 } + pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } + pre.code .literal.string, code .literal.string { color: #0C5404 } + pre.code .name.builtin, code .name.builtin { color: #352B84 } + pre.code .deleted, code .deleted { background-color: #DEB0A1} + pre.code .inserted, code .inserted { background-color: #A3D289} + + span.classifier { + font-family: sans-serif ; + font-style: oblique } + + span.classifier-delimiter { + font-family: sans-serif ; + font-weight: bold } + + span.interpreted { + font-family: sans-serif } + + span.option { + white-space: nowrap } + + span.pre { + white-space: pre } + + span.problematic { + color: red } + + span.section-subtitle { + /* font-size relative to parent (h1..h6 element) */ + font-size: 80% } + + table.citation { + border-left: solid 1px gray; + margin-left: 1px } + + table.docinfo { + margin: 2em 4em } + + table.docutils { + margin-top: 0.5em ; + margin-bottom: 0.5em } + + table.footnote { + border-left: solid 1px black; + margin-left: 1px } + + table.docutils td, table.docutils th, + table.docinfo td, table.docinfo th { + padding-left: 0.5em ; + padding-right: 0.5em ; + vertical-align: top } + + table.docutils th.field-name, table.docinfo th.docinfo-name { + font-weight: bold ; + text-align: left ; + white-space: nowrap ; + padding-left: 0 } + + /* "booktabs" style (no vertical lines) */ + table.docutils.booktabs { + border: 0px; + border-top: 2px solid; + border-bottom: 2px solid; + border-collapse: collapse; + } + table.docutils.booktabs * { + border: 0px; + } + table.docutils.booktabs th { + border-bottom: thin solid; + text-align: left; + } + + h1 tt.docutils, h2 tt.docutils, h3 tt.docutils, + h4 tt.docutils, h5 tt.docutils, h6 tt.docutils { + font-size: 100% } + + ul.auto-toc { + list-style-type: none } + + + + +
+

Sale Discount Display Amount

+ + +

+ + Beta + + + License: AGPL-3 + + + OCA/sale-workflow + + + Translate me on Weblate + + + Try me on Runboat + +

+

In standard Odoo only display the rate of the discount applied, never the + amount. It could be great to be able to tell the customer how much he spares. + This is the goal of this addons, it will show on a sale + order the total without the discount and the value of the discount. +

+

+ Table of contents +

+
+ +
+
+

+ Configuration +

+

To configure this module, you need to:

+
    +
  1. Go to Sales/Settings and check “Allow discounts on sales order lines”
    2. +
+
+
+

+ Usage +

+

To use this module, you need to:

+
    +
  1. Go on a sale order
    2. +
  2. Set a discount on a line
    3. +
  3. The value of the discount is dislayed in the total section as well as the total without it.
    4. +
+
+
+

+ 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 to smash it by providing a detailed and welcomed + + feedback. +

+

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

+
+
+

+ Credits +

+
+

+ Authors +

+
    +
  • ACSONE SA/NV
    • +
+
+
+

+ 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-workflow + + project on GitHub. +

+

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

+
+
+
+ diff --git a/sale_discount_display_amount/tests/test_discount_display_amount.py b/sale_discount_display_amount/tests/test_discount_display_amount.py index d76b4364e91..88d6f3223d4 100644 --- a/sale_discount_display_amount/tests/test_discount_display_amount.py +++ b/sale_discount_display_amount/tests/test_discount_display_amount.py @@ -19,10 +19,13 @@ def test_sale_discount_value(self): first_line = so.order_line[0] first_line.discount = 10 + self.assertAlmostEqual(first_line.price_subtotal_no_discount, 30.75) self.assertAlmostEqual(first_line.price_total_no_discount, 35.36) self.assertAlmostEqual(first_line.discount_total, 3.53) - self.assertAlmostEqual(so.discount_total, 3.53) + self.assertAlmostEqual(so.price_subtotal_no_discount, 30.75) self.assertAlmostEqual(so.price_total_no_discount, 35.36) + self.assertAlmostEqual(so.discount_total, 3.53) + self.assertAlmostEqual(so.discount_subtotal, 3.07) def test_sale_without_discount_value(self): product2 = self.env["product.product"].create( diff --git a/sale_discount_display_amount/views/res_config_settings_views.xml b/sale_discount_display_amount/views/res_config_settings_views.xml new file mode 100644 index 00000000000..072b208ae6d --- /dev/null +++ b/sale_discount_display_amount/views/res_config_settings_views.xml @@ -0,0 +1,29 @@ + + + + + res.config.settings.view.form.display.discount + res.config.settings + + + + +
+
+ +
+
+
+
+ + + + diff --git a/sale_discount_display_amount/views/sale_view.xml b/sale_discount_display_amount/views/sale_view.xml index 04593b377c7..38146dd8a2f 100644 --- a/sale_discount_display_amount/views/sale_view.xml +++ b/sale_discount_display_amount/views/sale_view.xml @@ -7,8 +7,36 @@ - - + + + + + + + + + +