From 35b35e463ceff4b28ebce16a8d17a85c741f303a Mon Sep 17 00:00:00 2001 From: "Luis M. Ontalba" Date: Fri, 13 Oct 2017 13:22:12 +0200 Subject: [PATCH 1/6] [ADD] account_payment_order_return (#395) --- account_payment_order_return/README.rst | 63 ++++++++++++ account_payment_order_return/__init__.py | 4 + account_payment_order_return/__openerp__.py | 22 ++++ account_payment_order_return/i18n/es.po | 27 +++++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../tests/__init__.py | 4 + .../test_account_payment_order_return.py | 97 ++++++++++++++++++ .../wizard/__init__.py | 4 + .../wizard/account_payment_line_create.py | 20 ++++ .../account_payment_line_create_view.xml | 14 +++ 10 files changed, 255 insertions(+) create mode 100644 account_payment_order_return/README.rst create mode 100644 account_payment_order_return/__init__.py create mode 100644 account_payment_order_return/__openerp__.py create mode 100644 account_payment_order_return/i18n/es.po create mode 100644 account_payment_order_return/static/description/icon.png create mode 100644 account_payment_order_return/tests/__init__.py create mode 100644 account_payment_order_return/tests/test_account_payment_order_return.py create mode 100644 account_payment_order_return/wizard/__init__.py create mode 100644 account_payment_order_return/wizard/account_payment_line_create.py create mode 100644 account_payment_order_return/wizard/account_payment_line_create_view.xml diff --git a/account_payment_order_return/README.rst b/account_payment_order_return/README.rst new file mode 100644 index 000000000..f977cf7ac --- /dev/null +++ b/account_payment_order_return/README.rst @@ -0,0 +1,63 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +============================ +Account Payment Order Return +============================ + +This module adds a check in the wizard where move lines are imported into +payment order. +This check lets include in selection lines from invoices linked to a +payment return. + +Installation +============ + +This module is auto-installed when you install *account_payment_return* and +*account_payment_order*. + +Usage +===== + +#. Go to Invoicing > Payments > Debit Orders. +#. Create a new record. +#. Click on button "Create Payment Lines fron Journal Items" to open the + wizard. +#. Click on the "Include move lines from returns " check. +#. Fill other options. +#. Click on button "Add All Move Lines". + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/173/9.0 + +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 smash it by providing detailed and welcomed feedback. + +Credits +======= + +Contributors +------------ +* Luis M. Ontalba + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +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. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/account_payment_order_return/__init__.py b/account_payment_order_return/__init__.py new file mode 100644 index 000000000..50e32ca47 --- /dev/null +++ b/account_payment_order_return/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from . import wizard diff --git a/account_payment_order_return/__openerp__.py b/account_payment_order_return/__openerp__.py new file mode 100644 index 000000000..d1d99ad0c --- /dev/null +++ b/account_payment_order_return/__openerp__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Tecnativa - Luis M. Ontalba +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +{ + 'name': 'Account Payment Order Return', + 'version': '9.0.1.0.0', + 'category': 'Banking addons', + 'author': 'Tecnativa, ' + 'Odoo Community Association (OCA)', + 'website': 'https://github.com/OCA/bank-payment', + 'depends': [ + 'account_payment_return', + 'account_payment_order', + ], + 'data': [ + 'wizard/account_payment_line_create_view.xml', + ], + 'license': 'AGPL-3', + 'installable': True, + 'auto_install': True, +} diff --git a/account_payment_order_return/i18n/es.po b/account_payment_order_return/i18n/es.po new file mode 100644 index 000000000..40cbdf674 --- /dev/null +++ b/account_payment_order_return/i18n/es.po @@ -0,0 +1,27 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_order_return +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-10-13 08:31+0000\n" +"PO-Revision-Date: 2017-10-13 08:31+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: account_payment_order_return +#: model:ir.model.fields,field_description:account_payment_order_return.field_account_payment_line_create_include_returned +msgid "Include move lines from returns" +msgstr "Incluir efectos devueltos" + +#. module: account_payment_order_return +#: model:ir.model,name:account_payment_order_return.model_account_payment_line_create +msgid "Wizard to create payment lines" +msgstr "Asistente para crear líneas de pago" + diff --git a/account_payment_order_return/static/description/icon.png b/account_payment_order_return/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/account_payment_order_return/tests/__init__.py b/account_payment_order_return/tests/__init__.py new file mode 100644 index 000000000..1e2614008 --- /dev/null +++ b/account_payment_order_return/tests/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0 + +from . import test_account_payment_order_return diff --git a/account_payment_order_return/tests/test_account_payment_order_return.py b/account_payment_order_return/tests/test_account_payment_order_return.py new file mode 100644 index 000000000..f8bbedc93 --- /dev/null +++ b/account_payment_order_return/tests/test_account_payment_order_return.py @@ -0,0 +1,97 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Tecnativa - Luis M. Ontalba +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0 + +from openerp.tests import common +from openerp import fields + + +class TestAccountPaymentOrderReturn(common.SavepointCase): + @classmethod + def setUpClass(cls): + super(TestAccountPaymentOrderReturn, cls).setUpClass() + cls.account_type = cls.env['account.account.type'].create({ + 'name': 'Test Account Type'}) + cls.a_receivable = cls.env['account.account'].create({ + 'code': 'TAA', + 'name': 'Test Receivable Account', + 'internal_type': 'receivable', + 'user_type_id': cls.account_type.id, + }) + cls.partner = cls.env['res.partner'].create({ + 'name': 'Test Partner 2', + 'parent_id': False, + }) + cls.journal = cls.env['account.journal'].create({ + 'name': 'Test Journal', + 'type': 'bank', + }) + cls.invoice = cls.env['account.invoice'].create({ + 'name': 'Test Invoice 3', + 'partner_id': cls.partner.id, + 'type': 'out_invoice', + 'journal_id': cls.journal.id, + 'invoice_line_ids': [(0, 0, { + 'account_id': cls.a_receivable.id, + 'name': 'Test line', + 'quantity': 1.0, + 'price_unit': 100.00, + })], + }) + cls.payment_mode = cls.env['account.payment.mode'].create({ + 'name': 'Test payment mode', + 'fixed_journal_id': cls.journal.id, + 'bank_account_link': 'variable', + 'payment_method_id': cls.env.ref( + 'account.account_payment_method_manual_in').id}) + cls.payment_order = cls.env['account.payment.order'].create({ + 'payment_mode_id': cls.payment_mode.id, + 'date_prefered': 'due', + 'payment_type': 'inbound', + }) + + def test_global(self): + self.invoice.signal_workflow('invoice_open') + wizard_o = self.env['account.payment.line.create'] + context = wizard_o._context.copy() + context.update({ + 'active_model': 'account.payment.order', + 'active_id': self.payment_order.id, + }) + wizard = wizard_o.with_context(context).create({ + 'order_id': self.payment_order.id, + 'journal_ids': [(4, self.journal.id)], + 'allow_blocked': True, + 'date_type': 'move', + 'move_date': fields.Date.today(), + 'payment_mode': 'any', + 'invoice': True, + 'include_returned': True, + + }) + wizard.populate() + self.assertTrue(len(wizard.move_line_ids), 1) + self.receivable_line = self.invoice.move_id.line_ids.filtered( + lambda x: x.account_id.internal_type == 'receivable') + # Invert the move to simulate the payment + self.payment_move = self.invoice.move_id.copy({ + 'journal_id': self.journal.id + }) + for move_line in self.payment_move.line_ids: + move_line.with_context(check_move_validity=False).write({ + 'debit': move_line.credit, 'credit': move_line.debit}) + self.payment_line = self.payment_move.line_ids.filtered( + lambda x: x.account_id.internal_type == 'receivable') + # Reconcile both + (self.receivable_line | self.payment_line).reconcile() + # Create payment return + self.payment_return = self.env['payment.return'].create( + {'journal_id': self.journal.id, + 'line_ids': [ + (0, 0, {'partner_id': self.partner.id, + 'move_line_ids': [(6, 0, self.payment_line.ids)], + 'amount': self.payment_line.credit})]}) + self.payment_return.action_confirm() + wizard.include_returned = False + wizard.populate() + self.assertFalse(wizard.move_line_ids) diff --git a/account_payment_order_return/wizard/__init__.py b/account_payment_order_return/wizard/__init__.py new file mode 100644 index 000000000..88586a32d --- /dev/null +++ b/account_payment_order_return/wizard/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from . import account_payment_line_create diff --git a/account_payment_order_return/wizard/account_payment_line_create.py b/account_payment_order_return/wizard/account_payment_line_create.py new file mode 100644 index 000000000..4cec05f1d --- /dev/null +++ b/account_payment_order_return/wizard/account_payment_line_create.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Tecnativa - Luis M. Ontalba +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from openerp import api, fields, models + + +class AccountPaymentLineCreate(models.TransientModel): + _inherit = 'account.payment.line.create' + + include_returned = fields.Boolean( + string='Include move lines from returns') + + @api.multi + def _prepare_move_line_domain(self): + domain = super(AccountPaymentLineCreate, + self)._prepare_move_line_domain() + if not self.include_returned: + domain.append(('invoice_id.returned_payment', '=', False)) + return domain diff --git a/account_payment_order_return/wizard/account_payment_line_create_view.xml b/account_payment_order_return/wizard/account_payment_line_create_view.xml new file mode 100644 index 000000000..bea4b1df3 --- /dev/null +++ b/account_payment_order_return/wizard/account_payment_line_create_view.xml @@ -0,0 +1,14 @@ + + + + + + account.payment.line.create + + + + + + + + From 07692ee2a55363269b4bf211f0b3c3d6db4ea9dc Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Sat, 28 Oct 2017 02:24:56 +0200 Subject: [PATCH 2/6] OCA Transbot updated translations from Transifex --- .../i18n/account_payment_order_return.pot | 25 ++++++++++++++++ account_payment_order_return/i18n/ca.po | 29 ++++++++++++++++++ account_payment_order_return/i18n/de.po | 29 ++++++++++++++++++ account_payment_order_return/i18n/es.po | 4 +-- account_payment_order_return/i18n/fr.po | 30 +++++++++++++++++++ 5 files changed, 115 insertions(+), 2 deletions(-) create mode 100644 account_payment_order_return/i18n/account_payment_order_return.pot create mode 100644 account_payment_order_return/i18n/ca.po create mode 100644 account_payment_order_return/i18n/de.po create mode 100644 account_payment_order_return/i18n/fr.po diff --git a/account_payment_order_return/i18n/account_payment_order_return.pot b/account_payment_order_return/i18n/account_payment_order_return.pot new file mode 100644 index 000000000..b8d75a482 --- /dev/null +++ b/account_payment_order_return/i18n/account_payment_order_return.pot @@ -0,0 +1,25 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_order_return +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\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: account_payment_order_return +#: model:ir.model.fields,field_description:account_payment_order_return.field_account_payment_line_create_include_returned +msgid "Include move lines from returns" +msgstr "" + +#. module: account_payment_order_return +#: model:ir.model,name:account_payment_order_return.model_account_payment_line_create +msgid "Wizard to create payment lines" +msgstr "" + diff --git a/account_payment_order_return/i18n/ca.po b/account_payment_order_return/i18n/ca.po new file mode 100644 index 000000000..1429d2a60 --- /dev/null +++ b/account_payment_order_return/i18n/ca.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_order_return +# +# Translators: +# Marc Tormo i Bochaca , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-10-15 00:40+0000\n" +"PO-Revision-Date: 2017-10-15 00:40+0000\n" +"Last-Translator: Marc Tormo i Bochaca , 2017\n" +"Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n" +"Language: ca\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: account_payment_order_return +#: model:ir.model.fields,field_description:account_payment_order_return.field_account_payment_line_create_include_returned +msgid "Include move lines from returns" +msgstr "" + +#. module: account_payment_order_return +#: model:ir.model,name:account_payment_order_return.model_account_payment_line_create +msgid "Wizard to create payment lines" +msgstr "Assistent per crear línies de pagament " diff --git a/account_payment_order_return/i18n/de.po b/account_payment_order_return/i18n/de.po new file mode 100644 index 000000000..fc7c33734 --- /dev/null +++ b/account_payment_order_return/i18n/de.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_order_return +# +# Translators: +# Akim Juillerat , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-10-15 00:40+0000\n" +"PO-Revision-Date: 2017-10-15 00:40+0000\n" +"Last-Translator: Akim Juillerat , 2017\n" +"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n" +"Language: de\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: account_payment_order_return +#: model:ir.model.fields,field_description:account_payment_order_return.field_account_payment_line_create_include_returned +msgid "Include move lines from returns" +msgstr "" + +#. module: account_payment_order_return +#: model:ir.model,name:account_payment_order_return.model_account_payment_line_create +msgid "Wizard to create payment lines" +msgstr "Assistent zum Anlegen von Zahlungszeilen" diff --git a/account_payment_order_return/i18n/es.po b/account_payment_order_return/i18n/es.po index 40cbdf674..f158231b6 100644 --- a/account_payment_order_return/i18n/es.po +++ b/account_payment_order_return/i18n/es.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * account_payment_order_return +# * account_payment_order_return # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2017-10-13 08:31+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" @@ -24,4 +25,3 @@ msgstr "Incluir efectos devueltos" #: model:ir.model,name:account_payment_order_return.model_account_payment_line_create msgid "Wizard to create payment lines" msgstr "Asistente para crear líneas de pago" - diff --git a/account_payment_order_return/i18n/fr.po b/account_payment_order_return/i18n/fr.po new file mode 100644 index 000000000..89dff4c89 --- /dev/null +++ b/account_payment_order_return/i18n/fr.po @@ -0,0 +1,30 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_payment_order_return +# +# Translators: +# OCA Transbot , 2017 +# Quentin THEURET , 2017 +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-12-02 02:22+0000\n" +"PO-Revision-Date: 2017-12-02 02:22+0000\n" +"Last-Translator: Quentin THEURET , 2017\n" +"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\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" + +#. module: account_payment_order_return +#: model:ir.model.fields,field_description:account_payment_order_return.field_account_payment_line_create_include_returned +msgid "Include move lines from returns" +msgstr "Inclure les écritures depuis les retours" + +#. module: account_payment_order_return +#: model:ir.model,name:account_payment_order_return.model_account_payment_line_create +msgid "Wizard to create payment lines" +msgstr "Assistant pour créer des lignes de paiement" From 7aec97ec83b47e4d37b54c027155206bd7552319 Mon Sep 17 00:00:00 2001 From: cubells Date: Fri, 21 Sep 2018 13:10:07 +0200 Subject: [PATCH 3/6] [MIG] account_payment_order_return: Migration to 11.0 --- account_payment_order_return/README.rst | 73 ++- account_payment_order_return/__init__.py | 3 +- .../{__openerp__.py => __manifest__.py} | 5 +- .../readme/CONTRIBUTORS.rst | 4 + .../readme/DESCRIPTION.rst | 4 + .../readme/INSTALL.rst | 2 + account_payment_order_return/readme/USAGE.rst | 7 + .../static/description/index.html | 445 ++++++++++++++++++ .../tests/__init__.py | 1 - .../test_account_payment_order_return.py | 7 +- .../{wizard => wizards}/__init__.py | 1 - .../account_payment_line_create.py | 3 +- .../account_payment_line_create_view.xml | 0 13 files changed, 522 insertions(+), 33 deletions(-) rename account_payment_order_return/{__openerp__.py => __manifest__.py} (82%) create mode 100644 account_payment_order_return/readme/CONTRIBUTORS.rst create mode 100644 account_payment_order_return/readme/DESCRIPTION.rst create mode 100644 account_payment_order_return/readme/INSTALL.rst create mode 100644 account_payment_order_return/readme/USAGE.rst create mode 100644 account_payment_order_return/static/description/index.html rename account_payment_order_return/{wizard => wizards}/__init__.py (81%) rename account_payment_order_return/{wizard => wizards}/account_payment_line_create.py (90%) rename account_payment_order_return/{wizard => wizards}/account_payment_line_create_view.xml (100%) diff --git a/account_payment_order_return/README.rst b/account_payment_order_return/README.rst index f977cf7ac..6a41735c7 100644 --- a/account_payment_order_return/README.rst +++ b/account_payment_order_return/README.rst @@ -1,16 +1,40 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 - ============================ Account Payment Order Return ============================ +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Fbank--payment-lightgray.png?logo=github + :target: https://github.com/OCA/bank-payment/tree/11.0/account_payment_order_return + :alt: OCA/bank-payment +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/bank-payment-11-0/bank-payment-11-0-account_payment_order_return + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/173/11.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + This module adds a check in the wizard where move lines are imported into payment order. This check lets include in selection lines from invoices linked to a payment return. +**Table of contents** + +.. contents:: + :local: + Installation ============ @@ -28,36 +52,45 @@ Usage #. Fill other options. #. Click on button "Add All Move Lines". -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/173/9.0 - 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 smash it by providing detailed and welcomed feedback. +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 ======= -Contributors ------------- -* Luis M. Ontalba +Authors +~~~~~~~ -Maintainer ----------- +* Tecnativa + +Contributors +~~~~~~~~~~~~ + +* Tecnativa + + * Luis M. Ontalba + * Vicent Cubells + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -This module is maintained by the OCA. - 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. -To contribute to this module, please visit https://odoo-community.org. +This module is part of the `OCA/bank-payment `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_payment_order_return/__init__.py b/account_payment_order_return/__init__.py index 50e32ca47..211e83205 100644 --- a/account_payment_order_return/__init__.py +++ b/account_payment_order_return/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html -from . import wizard +from . import wizards diff --git a/account_payment_order_return/__openerp__.py b/account_payment_order_return/__manifest__.py similarity index 82% rename from account_payment_order_return/__openerp__.py rename to account_payment_order_return/__manifest__.py index d1d99ad0c..340d1c779 100644 --- a/account_payment_order_return/__openerp__.py +++ b/account_payment_order_return/__manifest__.py @@ -1,10 +1,9 @@ -# -*- coding: utf-8 -*- # Copyright 2017 Tecnativa - Luis M. Ontalba # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html { 'name': 'Account Payment Order Return', - 'version': '9.0.1.0.0', + 'version': '11.0.1.0.0', 'category': 'Banking addons', 'author': 'Tecnativa, ' 'Odoo Community Association (OCA)', @@ -14,7 +13,7 @@ 'account_payment_order', ], 'data': [ - 'wizard/account_payment_line_create_view.xml', + 'wizards/account_payment_line_create_view.xml', ], 'license': 'AGPL-3', 'installable': True, diff --git a/account_payment_order_return/readme/CONTRIBUTORS.rst b/account_payment_order_return/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..60be6ab84 --- /dev/null +++ b/account_payment_order_return/readme/CONTRIBUTORS.rst @@ -0,0 +1,4 @@ +* Tecnativa + + * Luis M. Ontalba + * Vicent Cubells diff --git a/account_payment_order_return/readme/DESCRIPTION.rst b/account_payment_order_return/readme/DESCRIPTION.rst new file mode 100644 index 000000000..10e16c164 --- /dev/null +++ b/account_payment_order_return/readme/DESCRIPTION.rst @@ -0,0 +1,4 @@ +This module adds a check in the wizard where move lines are imported into +payment order. +This check lets include in selection lines from invoices linked to a +payment return. diff --git a/account_payment_order_return/readme/INSTALL.rst b/account_payment_order_return/readme/INSTALL.rst new file mode 100644 index 000000000..b52d23104 --- /dev/null +++ b/account_payment_order_return/readme/INSTALL.rst @@ -0,0 +1,2 @@ +This module is auto-installed when you install *account_payment_return* and +*account_payment_order*. diff --git a/account_payment_order_return/readme/USAGE.rst b/account_payment_order_return/readme/USAGE.rst new file mode 100644 index 000000000..a8591d03d --- /dev/null +++ b/account_payment_order_return/readme/USAGE.rst @@ -0,0 +1,7 @@ +#. Go to Invoicing > Payments > Debit Orders. +#. Create a new record. +#. Click on button "Create Payment Lines fron Journal Items" to open the + wizard. +#. Click on the "Include move lines from returns " check. +#. Fill other options. +#. Click on button "Add All Move Lines". diff --git a/account_payment_order_return/static/description/index.html b/account_payment_order_return/static/description/index.html new file mode 100644 index 000000000..23fd008fb --- /dev/null +++ b/account_payment_order_return/static/description/index.html @@ -0,0 +1,445 @@ + + + + + + +Account Payment Order Return + + + +
+

Account Payment Order Return

+ + +

Beta License: AGPL-3 OCA/bank-payment Translate me on Weblate Try me on Runbot

+

This module adds a check in the wizard where move lines are imported into +payment order. +This check lets include in selection lines from invoices linked to a +payment return.

+

Table of contents

+ +
+

Installation

+

This module is auto-installed when you install account_payment_return and +account_payment_order.

+
+
+

Usage

+
    +
  1. Go to Invoicing > Payments > Debit Orders.
    2. +
  2. Create a new record.
    3. +
  3. Click on button “Create Payment Lines fron Journal Items” to open the +wizard.
    4. +
  4. Click on the “Include move lines from returns ” check.
    5. +
  5. Fill other options.
    6. +
  6. Click on button “Add All Move Lines”.
    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.

+

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/bank-payment project on GitHub.

+

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

+
+
+
+ + diff --git a/account_payment_order_return/tests/__init__.py b/account_payment_order_return/tests/__init__.py index 1e2614008..ade564e41 100644 --- a/account_payment_order_return/tests/__init__.py +++ b/account_payment_order_return/tests/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0 from . import test_account_payment_order_return diff --git a/account_payment_order_return/tests/test_account_payment_order_return.py b/account_payment_order_return/tests/test_account_payment_order_return.py index f8bbedc93..cb73d4507 100644 --- a/account_payment_order_return/tests/test_account_payment_order_return.py +++ b/account_payment_order_return/tests/test_account_payment_order_return.py @@ -1,9 +1,8 @@ -# -*- coding: utf-8 -*- # Copyright 2017 Tecnativa - Luis M. Ontalba # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0 -from openerp.tests import common -from openerp import fields +from odoo.tests import common +from odoo import fields class TestAccountPaymentOrderReturn(common.SavepointCase): @@ -51,7 +50,7 @@ class TestAccountPaymentOrderReturn(common.SavepointCase): }) def test_global(self): - self.invoice.signal_workflow('invoice_open') + self.invoice.action_invoice_open() wizard_o = self.env['account.payment.line.create'] context = wizard_o._context.copy() context.update({ diff --git a/account_payment_order_return/wizard/__init__.py b/account_payment_order_return/wizards/__init__.py similarity index 81% rename from account_payment_order_return/wizard/__init__.py rename to account_payment_order_return/wizards/__init__.py index 88586a32d..6cfe26506 100644 --- a/account_payment_order_return/wizard/__init__.py +++ b/account_payment_order_return/wizards/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html from . import account_payment_line_create diff --git a/account_payment_order_return/wizard/account_payment_line_create.py b/account_payment_order_return/wizards/account_payment_line_create.py similarity index 90% rename from account_payment_order_return/wizard/account_payment_line_create.py rename to account_payment_order_return/wizards/account_payment_line_create.py index 4cec05f1d..d443af40d 100644 --- a/account_payment_order_return/wizard/account_payment_line_create.py +++ b/account_payment_order_return/wizards/account_payment_line_create.py @@ -1,8 +1,7 @@ -# -*- coding: utf-8 -*- # Copyright 2017 Tecnativa - Luis M. Ontalba # License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html -from openerp import api, fields, models +from odoo import api, fields, models class AccountPaymentLineCreate(models.TransientModel): diff --git a/account_payment_order_return/wizard/account_payment_line_create_view.xml b/account_payment_order_return/wizards/account_payment_line_create_view.xml similarity index 100% rename from account_payment_order_return/wizard/account_payment_line_create_view.xml rename to account_payment_order_return/wizards/account_payment_line_create_view.xml From f877eb2c8a0bfa1b4172cac2b3639c2494033789 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 25 Oct 2018 15:09:40 +0000 Subject: [PATCH 4/6] [UPD] README.rst --- account_payment_order_return/README.rst | 2 +- account_payment_order_return/static/description/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/account_payment_order_return/README.rst b/account_payment_order_return/README.rst index 6a41735c7..d46b13182 100644 --- a/account_payment_order_return/README.rst +++ b/account_payment_order_return/README.rst @@ -20,7 +20,7 @@ Account Payment Order Return :target: https://translation.odoo-community.org/projects/bank-payment-11-0/bank-payment-11-0-account_payment_order_return :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/173/11.0 + :target: https://runbot.odoo-community.org/runbot/97/11.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| diff --git a/account_payment_order_return/static/description/index.html b/account_payment_order_return/static/description/index.html index 23fd008fb..450f2d9ec 100644 --- a/account_payment_order_return/static/description/index.html +++ b/account_payment_order_return/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/bank-payment Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/bank-payment Translate me on Weblate Try me on Runbot

This module adds a check in the wizard where move lines are imported into payment order. This check lets include in selection lines from invoices linked to a From a389888dbc9456a5faf7754cf761433e14b1dc9e Mon Sep 17 00:00:00 2001 From: oca-travis Date: Thu, 25 Oct 2018 15:32:13 +0000 Subject: [PATCH 5/6] [UPD] Update account_payment_order_return.pot --- .../i18n/account_payment_order_return.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_payment_order_return/i18n/account_payment_order_return.pot b/account_payment_order_return/i18n/account_payment_order_return.pot index b8d75a482..a341cc9df 100644 --- a/account_payment_order_return/i18n/account_payment_order_return.pot +++ b/account_payment_order_return/i18n/account_payment_order_return.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0c\n" +"Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" From 8a0f9f5d60072ed977138f0a8363cbea372f4f8e Mon Sep 17 00:00:00 2001 From: Kitti U Date: Fri, 29 Mar 2019 14:19:46 +0700 Subject: [PATCH 6/6] [12.0][MIG] account_payment_order_return :100644 100644 d46b1318 a23b471a M account_payment_order_return/README.rst :100644 100644 340d1c77 1235bcb1 M account_payment_order_return/__manifest__.py :100644 100644 a341cc9d be7d7bbb M account_payment_order_return/i18n/account_payment_order_return.pot :100644 100644 60be6ab8 e6b32b37 M account_payment_order_return/readme/CONTRIBUTORS.rst :100644 100644 a8591d03 826c26df M account_payment_order_return/readme/USAGE.rst :100644 100644 450f2d9e a5f5d975 M account_payment_order_return/static/description/index.html --- account_payment_order_return/README.rst | 14 ++++++++------ account_payment_order_return/__manifest__.py | 2 +- .../i18n/account_payment_order_return.pot | 6 ++++-- .../readme/CONTRIBUTORS.rst | 2 ++ account_payment_order_return/readme/USAGE.rst | 2 +- .../static/description/index.html | 9 +++++---- oca_dependencies.txt | 3 +++ 7 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 oca_dependencies.txt diff --git a/account_payment_order_return/README.rst b/account_payment_order_return/README.rst index d46b13182..a23b471ae 100644 --- a/account_payment_order_return/README.rst +++ b/account_payment_order_return/README.rst @@ -14,13 +14,13 @@ Account Payment Order Return :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fbank--payment-lightgray.png?logo=github - :target: https://github.com/OCA/bank-payment/tree/11.0/account_payment_order_return + :target: https://github.com/OCA/bank-payment/tree/12.0/account_payment_order_return :alt: OCA/bank-payment .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/bank-payment-11-0/bank-payment-11-0-account_payment_order_return + :target: https://translation.odoo-community.org/projects/bank-payment-12-0/bank-payment-12-0-account_payment_order_return :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/97/11.0 + :target: https://runbot.odoo-community.org/runbot/97/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -46,7 +46,7 @@ Usage #. Go to Invoicing > Payments > Debit Orders. #. Create a new record. -#. Click on button "Create Payment Lines fron Journal Items" to open the +#. Click on button "Create Payment Lines from Journal Items" to open the wizard. #. Click on the "Include move lines from returns " check. #. Fill other options. @@ -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. @@ -78,6 +78,8 @@ Contributors * Luis M. Ontalba * Vicent Cubells +* Kitti U. + Maintainers ~~~~~~~~~~~ @@ -91,6 +93,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/bank-payment `_ project on GitHub. +This module is part of the `OCA/bank-payment `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_payment_order_return/__manifest__.py b/account_payment_order_return/__manifest__.py index 340d1c779..1235bcb13 100644 --- a/account_payment_order_return/__manifest__.py +++ b/account_payment_order_return/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'Account Payment Order Return', - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'category': 'Banking addons', 'author': 'Tecnativa, ' 'Odoo Community Association (OCA)', diff --git a/account_payment_order_return/i18n/account_payment_order_return.pot b/account_payment_order_return/i18n/account_payment_order_return.pot index a341cc9df..be7d7bbbf 100644 --- a/account_payment_order_return/i18n/account_payment_order_return.pot +++ b/account_payment_order_return/i18n/account_payment_order_return.pot @@ -4,8 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-03-29 07:09+0000\n" +"PO-Revision-Date: 2019-03-29 07:09+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -14,7 +16,7 @@ msgstr "" "Plural-Forms: \n" #. module: account_payment_order_return -#: model:ir.model.fields,field_description:account_payment_order_return.field_account_payment_line_create_include_returned +#: model:ir.model.fields,field_description:account_payment_order_return.field_account_payment_line_create__include_returned msgid "Include move lines from returns" msgstr "" diff --git a/account_payment_order_return/readme/CONTRIBUTORS.rst b/account_payment_order_return/readme/CONTRIBUTORS.rst index 60be6ab84..e6b32b377 100644 --- a/account_payment_order_return/readme/CONTRIBUTORS.rst +++ b/account_payment_order_return/readme/CONTRIBUTORS.rst @@ -2,3 +2,5 @@ * Luis M. Ontalba * Vicent Cubells + +* Kitti U. diff --git a/account_payment_order_return/readme/USAGE.rst b/account_payment_order_return/readme/USAGE.rst index a8591d03d..826c26df4 100644 --- a/account_payment_order_return/readme/USAGE.rst +++ b/account_payment_order_return/readme/USAGE.rst @@ -1,6 +1,6 @@ #. Go to Invoicing > Payments > Debit Orders. #. Create a new record. -#. Click on button "Create Payment Lines fron Journal Items" to open the +#. Click on button "Create Payment Lines from Journal Items" to open the wizard. #. Click on the "Include move lines from returns " check. #. Fill other options. diff --git a/account_payment_order_return/static/description/index.html b/account_payment_order_return/static/description/index.html index 450f2d9ec..a5f5d975d 100644 --- a/account_payment_order_return/static/description/index.html +++ b/account_payment_order_return/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/bank-payment Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/bank-payment Translate me on Weblate Try me on Runbot

This module adds a check in the wizard where move lines are imported into payment order. This check lets include in selection lines from invoices linked to a @@ -396,7 +396,7 @@ payment return.

  1. Go to Invoicing > Payments > Debit Orders.
  2. Create a new record.
    3. -
  3. Click on button “Create Payment Lines fron Journal Items” to open the +
  4. Click on button “Create Payment Lines from Journal Items” to open the wizard.
  5. Click on the “Include move lines from returns ” check.
  6. Fill other options.
    7. @@ -408,7 +408,7 @@ wizard.

    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.

    @@ -427,6 +427,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
  7. Vicent Cubells <vicent.cubells@tecnativa.com>
    8. +
  8. Kitti U. <kittiu@ecosoft.co.th>
    9. @@ -436,7 +437,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

    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/bank-payment project on GitHub.

    +

    This module is part of the OCA/bank-payment project on GitHub.

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

    diff --git a/oca_dependencies.txt b/oca_dependencies.txt new file mode 100644 index 000000000..e5de16176 --- /dev/null +++ b/oca_dependencies.txt @@ -0,0 +1,3 @@ +# list the OCA project dependencies, one per line +# add a github url if you need a forked version +account-payment