From e3774cfd3c52dd332bb825b3023ab51f5385530d Mon Sep 17 00:00:00 2001 From: Enric Tobella Date: Thu, 28 Sep 2017 18:20:03 +0200 Subject: [PATCH] [ADD] PoS session pay invoice module --- .gitignore | 1 + account_cash_invoice/README.rst | 57 ++++++++++ account_cash_invoice/__init__.py | 5 + account_cash_invoice/__manifest__.py | 21 ++++ account_cash_invoice/models/__init__.py | 4 + .../models/account_bank_statement_line.py | 35 ++++++ .../static/description/icon.png | Bin 0 -> 9455 bytes account_cash_invoice/tests/__init__.py | 4 + .../tests/test_pay_invoice.py | 81 ++++++++++++++ account_cash_invoice/wizard/__init__.py | 5 + .../wizard/cash_invoice_in.py | 100 +++++++++++++++++ .../wizard/cash_invoice_in.xml | 49 +++++++++ .../wizard/cash_invoice_out.py | 104 ++++++++++++++++++ .../wizard/cash_invoice_out.xml | 48 ++++++++ pos_session_pay_invoice/README.rst | 56 ++++++++++ pos_session_pay_invoice/__init__.py | 4 + pos_session_pay_invoice/__manifest__.py | 23 ++++ .../static/description/icon.png | Bin 0 -> 9455 bytes pos_session_pay_invoice/tests/__init__.py | 4 + .../tests/test_pay_invoice.py | 86 +++++++++++++++ .../views/account_bank_statement.xml | 21 ++++ pos_session_pay_invoice/views/pos_session.xml | 43 ++++++++ pos_session_pay_invoice/wizard/__init__.py | 5 + .../wizard/cash_invoice_in.py | 56 ++++++++++ .../wizard/cash_invoice_in.xml | 12 ++ .../wizard/cash_invoice_out.py | 53 +++++++++ .../wizard/cash_invoice_out.xml | 12 ++ 27 files changed, 889 insertions(+) create mode 100644 account_cash_invoice/README.rst create mode 100644 account_cash_invoice/__init__.py create mode 100644 account_cash_invoice/__manifest__.py create mode 100644 account_cash_invoice/models/__init__.py create mode 100644 account_cash_invoice/models/account_bank_statement_line.py create mode 100644 account_cash_invoice/static/description/icon.png create mode 100644 account_cash_invoice/tests/__init__.py create mode 100644 account_cash_invoice/tests/test_pay_invoice.py create mode 100644 account_cash_invoice/wizard/__init__.py create mode 100644 account_cash_invoice/wizard/cash_invoice_in.py create mode 100644 account_cash_invoice/wizard/cash_invoice_in.xml create mode 100644 account_cash_invoice/wizard/cash_invoice_out.py create mode 100644 account_cash_invoice/wizard/cash_invoice_out.xml create mode 100644 pos_session_pay_invoice/README.rst create mode 100644 pos_session_pay_invoice/__init__.py create mode 100644 pos_session_pay_invoice/__manifest__.py create mode 100644 pos_session_pay_invoice/static/description/icon.png create mode 100644 pos_session_pay_invoice/tests/__init__.py create mode 100644 pos_session_pay_invoice/tests/test_pay_invoice.py create mode 100644 pos_session_pay_invoice/views/account_bank_statement.xml create mode 100644 pos_session_pay_invoice/views/pos_session.xml create mode 100644 pos_session_pay_invoice/wizard/__init__.py create mode 100644 pos_session_pay_invoice/wizard/cash_invoice_in.py create mode 100644 pos_session_pay_invoice/wizard/cash_invoice_in.xml create mode 100644 pos_session_pay_invoice/wizard/cash_invoice_out.py create mode 100644 pos_session_pay_invoice/wizard/cash_invoice_out.xml diff --git a/.gitignore b/.gitignore index c505b25c..bfd2a51d 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ var/ *.egg-info/ .installed.cfg *.egg +.idea # PyInstaller # Usually these files are written by a python script from a template diff --git a/account_cash_invoice/README.rst b/account_cash_invoice/README.rst new file mode 100644 index 00000000..6e02582a --- /dev/null +++ b/account_cash_invoice/README.rst @@ -0,0 +1,57 @@ +.. image:: https://img.shields.io/badge/licence-LGPL--3-blue.svg + :alt: License: LGPL-3 + +=============== +PoS Pay invoice +=============== + +This modules allows to pay an existing Supplier Invoice / Customer Refund, or +to collect payment for an existing Customer Invoice, using the PoS +backend session. + + +Usage +===== + +#. Go to *Point of Sale / Dashboard* and create and/or open an existing + Session. +#. Press the button **Pay Invoice** to pay a Supplier Invoice or a Customer + Refund. You will need to select the expected Journal +#. Select **Collect Payment from Invoice** in to receive a payment of an + existing Customer Invoice or a Supplier Refund. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/repo/github-com-oca-pos-184 + + +Known issues / Roadmap +====================== + +* Cannot pay invoices in a different currency than that defined in the journal + associated to the payment method used to pay/collect payment. + + +Credits +======= + +Contributors +------------ + +* Enric Tobella + + +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 http://odoo-community.org. diff --git a/account_cash_invoice/__init__.py b/account_cash_invoice/__init__.py new file mode 100644 index 00000000..d35b1e82 --- /dev/null +++ b/account_cash_invoice/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from . import models +from . import wizard diff --git a/account_cash_invoice/__manifest__.py b/account_cash_invoice/__manifest__.py new file mode 100644 index 00000000..11c980e3 --- /dev/null +++ b/account_cash_invoice/__manifest__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2017 Creu Blanca +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +{ + 'name': 'Account cash invoice', + 'version': '10.0.1.0.0', + 'category': 'Account', + 'author': "Creu Blanca," + "Odoo Community Association (OCA)", + 'website': 'https://github.com/OCA/pos', + 'summary': 'Pay and receive invoices from bank statements', + "license": "LGPL-3", + 'depends': [ + "account", + ], + 'data': [ + "wizard/cash_invoice_out.xml", + "wizard/cash_invoice_in.xml", + ], +} diff --git a/account_cash_invoice/models/__init__.py b/account_cash_invoice/models/__init__.py new file mode 100644 index 00000000..ecac888f --- /dev/null +++ b/account_cash_invoice/models/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from . import account_bank_statement_line diff --git a/account_cash_invoice/models/account_bank_statement_line.py b/account_cash_invoice/models/account_bank_statement_line.py new file mode 100644 index 00000000..2dfd0b5b --- /dev/null +++ b/account_cash_invoice/models/account_bank_statement_line.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2017 Creu Blanca +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from odoo import api, fields, models + + +class AccountBankStatementLine(models.Model): + _inherit = 'account.bank.statement.line' + + invoice_id = fields.Many2one( + 'account.invoice', + string='Invoice', + readonly=True + ) + + @api.multi + def fast_counterpart_creation(self): + for st_line in self: + if not st_line.invoice_id: + super( + AccountBankStatementLine, st_line + ).fast_counterpart_creation() + else: + invoice = st_line.invoice_id + move_line = invoice.move_id.line_ids.filtered( + lambda r: r.account_id.id == invoice.account_id.id + ) + vals = { + 'name': st_line.name, + 'debit': st_line.amount < 0 and -st_line.amount or 0.0, + 'credit': st_line.amount > 0 and st_line.amount or 0.0, + 'move_line': move_line + } + st_line.process_reconciliation(counterpart_aml_dicts=[vals]) diff --git a/account_cash_invoice/static/description/icon.png b/account_cash_invoice/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z z?n?eq1XP>p-IM$Z^C;2L3itnbJZAip*Zo0aw2bs8@(s^~*8T9go!%dHcAz2lM;`yp zD=7&xjFV$S&5uDaiScyD?B-i1ze`+CoRtz`Wn+Zl&#s4&}MO{@N!ufrzjG$B79)Y2d3tBk&)TxUTw@QS0TEL_?njX|@vq?Uz(nBFK5Pq7*xj#u*R&i|?7+6# z+|r_n#SW&LXhtheZdah{ZVoqwyT{D>MC3nkFF#N)xLi{p7J1jXlmVeb;cP5?e(=f# zuT7fvjSbjS781v?7{)-X3*?>tq?)Yd)~|1{BDS(pqC zC}~H#WXlkUW*H5CDOo<)#x7%RY)A;ShGhI5s*#cRDA8YgqG(HeKDx+#(ZQ?386dv! zlXCO)w91~Vw4AmOcATuV653fa9R$fyK8ul%rG z-wfS zihugoZyr38Im?Zuh6@RcF~t1anQu7>#lPpb#}4cOA!EM11`%f*07RqOVkmX{p~KJ9 z^zP;K#|)$`^Rb{rnHGH{~>1(fawV0*Z#)}M`m8-?ZJV<+e}s9wE# z)l&az?w^5{)`S(%MRzxdNqrs1n*-=jS^_jqE*5XDrA0+VE`5^*p3CuM<&dZEeCjoz zR;uu_H9ZPZV|fQq`Cyw4nscrVwi!fE6ciMmX$!_hN7uF;jjKG)d2@aC4ropY)8etW=xJvni)8eHi`H$%#zn^WJ5NLc-rqk|u&&4Z6fD_m&JfSI1Bvb?b<*n&sfl0^t z=HnmRl`XrFvMKB%9}>PaA`m-fK6a0(8=qPkWS5bb4=v?XcWi&hRY?O5HdulRi4?fN zlsJ*N-0Qw+Yic@s0(2uy%F@ib;GjXt01Fmx5XbRo6+n|pP(&nodMoap^z{~q ziEeaUT@Mxe3vJSfI6?uLND(CNr=#^W<1b}jzW58bIfyWTDle$mmS(|x-0|2UlX+9k zQ^EX7Nw}?EzVoBfT(-LT|=9N@^hcn-_p&sqG z&*oVs2JSU+N4ZD`FhCAWaS;>|wH2G*Id|?pa#@>tyxX`+4HyIArWDvVrX)2WAOQff z0qyHu&-S@i^MS-+j--!pr4fPBj~_8({~e1bfcl0wI1kaoN>mJL6KUPQm5N7lB(ui1 zE-o%kq)&djzWJ}ob<-GfDlkB;F31j-VHKvQUGQ3sp`CwyGJk_i!y^sD0fqC@$9|jO zOqN!r!8-p==F@ZVP=U$qSpY(gQ0)59P1&t@y?5rvg<}E+GB}26NYPp4f2YFQrQtot5mn3wu_qprZ=>Ig-$ zbW26Ws~IgY>}^5w`vTB(G`PTZaDiGBo5o(tp)qli|NeV( z@H_=R8V39rt5J5YB2Ky?4eJJ#b`_iBe2ot~6%7mLt5t8Vwi^Jy7|jWXqa3amOIoRb zOr}WVFP--DsS`1WpN%~)t3R!arKF^Q$e12KEqU36AWwnCBICpH4XCsfnyrHr>$I$4 z!DpKX$OKLWarN7nv@!uIA+~RNO)l$$w}p(;b>mx8pwYvu;dD_unryX_NhT8*Tj>BTrTTL&!?O+%Rv;b?B??gSzdp?6Uug9{ zd@V08Z$BdI?fpoCS$)t4mg4rT8Q_I}h`0d-vYZ^|dOB*Q^S|xqTV*vIg?@fVFSmMpaw0qtTRbx} z({Pg?#{2`sc9)M5N$*N|4;^t$+QP?#mov zGVC@I*lBVrOU-%2y!7%)fAKjpEFsgQc4{amtiHb95KQEwvf<(3T<9-Zm$xIew#P22 zc2Ix|App^>v6(3L_MCU0d3W##AB0M~3D00EWoKZqsJYT(#@w$Y_H7G22M~ApVFTRHMI_3be)Lkn#0F*V8Pq zc}`Cjy$bE;FJ6H7p=0y#R>`}-m4(0F>%@P|?7fx{=R^uFdISRnZ2W_xQhD{YuR3t< z{6yxu=4~JkeA;|(J6_nv#>Nvs&FuLA&PW^he@t(UwFFE8)|a!R{`E`K`i^ZnyE4$k z;(749Ix|oi$c3QbEJ3b~D_kQsPz~fIUKym($a_7dJ?o+40*OLl^{=&oq$<#Q(yyrp z{J-FAniyAw9tPbe&IhQ|a`DqFTVQGQ&Gq3!C2==4x{6EJwiPZ8zub-iXoUtkJiG{} zPaR&}_fn8_z~(=;5lD-aPWD3z8PZS@AaUiomF!G8I}Mf>e~0g#BelA-5#`cj;O5>N Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/account_cash_invoice/tests/__init__.py b/account_cash_invoice/tests/__init__.py new file mode 100644 index 00000000..510806cb --- /dev/null +++ b/account_cash_invoice/tests/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from . import test_pay_invoice diff --git a/account_cash_invoice/tests/test_pay_invoice.py b/account_cash_invoice/tests/test_pay_invoice.py new file mode 100644 index 00000000..2b26ec44 --- /dev/null +++ b/account_cash_invoice/tests/test_pay_invoice.py @@ -0,0 +1,81 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Creu Blanca +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from odoo.tests import common + + +class TestSessionPayInvoice(common.TransactionCase): + def setUp(self): + super(TestSessionPayInvoice, self).setUp() + self.company = self.env.ref('base.main_company') + partner = self.env.ref('base.partner_demo') + self.invoice_out = self.env['account.invoice'].create({ + 'company_id': self.company.id, + 'partner_id': partner.id, + 'date_invoice': '2016-03-12', + 'type': 'out_invoice', + }) + account = self.env['account.account'].create({ + 'code': 'test_cash_pay_invoice', + 'company_id': self.company.id, + 'name': 'Test', + 'user_type_id': self.env.ref( + 'account.data_account_type_revenue').id + }) + self.env['account.invoice.line'].create({ + 'product_id': self.env.ref('product.product_delivery_02').id, + 'invoice_id': self.invoice_out.id, + 'account_id': account.id, + 'name': 'Producto de prueba', + 'quantity': 1.0, + 'price_unit': 100.0, + }) + self.invoice_out._onchange_invoice_line_ids() + self.invoice_out.action_invoice_open() + self.invoice_out.number = '2999/99999' + self.invoice_in = self.env['account.invoice'].create({ + 'partner_id': partner.id, + 'company_id': self.company.id, + 'type': 'in_invoice', + 'date_invoice': '2016-03-12', + }) + self.env['account.invoice.line'].create({ + 'product_id': self.env.ref('product.product_delivery_02').id, + 'invoice_id': self.invoice_in.id, + 'name': 'Producto de prueba', + 'account_id': account.id, + 'quantity': 1.0, + 'price_unit': 100.0, + }) + self.invoice_in._onchange_invoice_line_ids() + self.invoice_in.action_invoice_open() + self.invoice_in.number = '2999/99999' + self.journal = self.env['account.journal'].search([ + ('company_id', '=', self.company.id), + ('type', '=', 'cash') + ], limit=1).ensure_one() + + def test_bank_statement(self): + statement = self.env['account.bank.statement'].create({ + 'name': 'Statment', + 'journal_id': self.journal.id + }) + in_invoice = self.env['cash.invoice.in'].with_context( + active_ids=statement.ids, active_model='account.bank.statement' + ).create({ + 'invoice_id': self.invoice_in.id, + 'amount': 100.0 + }) + in_invoice.run() + out_invoice = self.env['cash.invoice.out'].with_context( + active_ids=statement.ids, active_model='account.bank.statement' + ).create({ + 'invoice_id': self.invoice_out.id, + 'amount': 100.0 + }) + out_invoice.run() + statement.balance_end_real = statement.balance_start + statement.check_confirm_bank() + self.assertEqual(self.invoice_out.residual, 0.) + self.assertEqual(self.invoice_in.residual, 0.) diff --git a/account_cash_invoice/wizard/__init__.py b/account_cash_invoice/wizard/__init__.py new file mode 100644 index 00000000..030f06a1 --- /dev/null +++ b/account_cash_invoice/wizard/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from . import cash_invoice_in +from . import cash_invoice_out diff --git a/account_cash_invoice/wizard/cash_invoice_in.py b/account_cash_invoice/wizard/cash_invoice_in.py new file mode 100644 index 00000000..2a4f11da --- /dev/null +++ b/account_cash_invoice/wizard/cash_invoice_in.py @@ -0,0 +1,100 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2017 Creu Blanca +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from odoo import api, fields, models + + +class CashInvoiceIn(models.TransientModel): + _name = 'cash.invoice.in' + _inherit = 'cash.box.out' + + def _default_value(self, default_function): + active_model = self.env.context.get('active_model', False) + if active_model: + active_ids = self.env.context.get('active_ids', False) + return default_function(active_model, active_ids) + return None + + def _default_company(self): + return self._default_value(self.default_company) + + def _default_currency(self): + return self._default_value(self.default_currency) + + def _default_journals(self): + return self._default_value(self.default_journals) + + def _default_journal(self): + journals = self._default_journals() + if journals and len(journals.ids) > 0: + return self.env['account.journal'].browse( + journals.ids[0] + ).ensure_one() + + def _default_journal_count(self): + return len(self._default_journals().ids) + + invoice_id = fields.Many2one( + 'account.invoice', + string='Invoice', + required=True + ) + name = fields.Char( + related='invoice_id.number' + ) + company_id = fields.Many2one( + 'res.company', + default=_default_company, + required=True, + readonly=True + ) + currency_id = fields.Many2one( + 'res.currency', + default=_default_currency, + required=True, + readonly=True + ) + journal_ids = fields.Many2many( + 'account.journal', + default=_default_journals, + required=True, + readonly=True + ) + journal_id = fields.Many2one( + 'account.journal', + required=True, + default=_default_journal + ) + journal_count = fields.Integer( + default=_default_journal_count, + readonly=True + ) + + def default_company(self, active_model, active_ids): + return self.env[active_model].browse(active_ids)[0].company_id + + def default_currency(self, active_model, active_ids): + return self.default_company(active_model, active_ids).currency_id + + def default_journals(self, active_model, active_ids): + return self.env[active_model].browse(active_ids)[0].journal_id + + @api.onchange('journal_ids') + def compute_journal_count(self): + self.journal_count = len(self.journal_ids.ids) + + @api.onchange('invoice_id') + def _onchange_invoice(self): + self.amount = self.invoice_id.residual + + @api.multi + def _calculate_values_for_statement_line(self, record): + res = super(CashInvoiceIn, self)._calculate_values_for_statement_line( + record + ) + res['invoice_id'] = self.invoice_id.id + res['account_id'] = self.invoice_id.account_id.id + res['ref'] = self.invoice_id.number + res['partner_id'] = self.invoice_id.partner_id.id + return res diff --git a/account_cash_invoice/wizard/cash_invoice_in.xml b/account_cash_invoice/wizard/cash_invoice_in.xml new file mode 100644 index 00000000..8b520fe2 --- /dev/null +++ b/account_cash_invoice/wizard/cash_invoice_in.xml @@ -0,0 +1,49 @@ + + + + cash_invoice_in_form + cash.invoice.in + form + +
+ + + + + + + +
+
+
+
+
+ + +
diff --git a/account_cash_invoice/wizard/cash_invoice_out.py b/account_cash_invoice/wizard/cash_invoice_out.py new file mode 100644 index 00000000..68dee676 --- /dev/null +++ b/account_cash_invoice/wizard/cash_invoice_out.py @@ -0,0 +1,104 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2017 Creu Blanca +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from odoo import api, fields, models + + +class CashInvoiceOut(models.TransientModel): + _name = 'cash.invoice.out' + _inherit = 'cash.box.in' + + def _default_value(self, default_function): + active_model = self.env.context.get('active_model', False) + if active_model: + active_ids = self.env.context.get('active_ids', False) + return default_function(active_model, active_ids) + return None + + def _default_company(self): + return self._default_value(self.default_company) + + def _default_currency(self): + return self._default_value(self.default_currency) + + def _default_journals(self): + return self._default_value(self.default_journals) + + def _default_journal(self): + journals = self._default_journals() + if journals and len(journals.ids) > 0: + return self.env['account.journal'].browse( + journals.ids[0] + ).ensure_one() + + def _default_journal_count(self): + return len(self._default_journals()) + + invoice_id = fields.Many2one( + 'account.invoice', + string='Invoice', + required=True + ) + name = fields.Char( + related='invoice_id.number' + ) + company_id = fields.Many2one( + 'res.company', + default=_default_company, + required=True, + readonly=True + ) + currency_id = fields.Many2one( + 'res.currency', + default=_default_currency, + required=True, + readonly=True) + journal_ids = fields.Many2many( + 'account.journal', + default=_default_journals, + required=True, + readonly=True + ) + journal_id = fields.Many2one( + 'account.journal', + required=True, + default=_default_journal + ) + journal_count = fields.Integer( + default=_default_journal_count, + readonly=True + ) + + def default_company(self, active_model, active_ids): + return self.env[active_model].browse(active_ids)[0].company_id + + def default_currency(self, active_model, active_ids): + return self.default_company(active_model, active_ids).currency_id + + def default_journals(self, active_model, active_ids): + return self.env[active_model].browse(active_ids)[0].journal_id + + @api.onchange('journal_ids') + def compute_journal_count(self): + self.journal_count = len(self.journal_ids.ids) + + @api.onchange('journal_id') + def _onchange_journal(self): + self.currency_id = (self.journal_id.currency_id or + self.journal_id.company_id.currency_id) + + @api.onchange('invoice_id') + def _onchange_invoice(self): + self.amount = self.invoice_id.residual + + @api.multi + def _calculate_values_for_statement_line(self, record): + res = super(CashInvoiceOut, self)._calculate_values_for_statement_line( + record + ) + res['invoice_id'] = self.invoice_id.id + res['account_id'] = self.invoice_id.account_id.id + res['ref'] = self.invoice_id.number + res['partner_id'] = self.invoice_id.partner_id.id + return res diff --git a/account_cash_invoice/wizard/cash_invoice_out.xml b/account_cash_invoice/wizard/cash_invoice_out.xml new file mode 100644 index 00000000..0060a598 --- /dev/null +++ b/account_cash_invoice/wizard/cash_invoice_out.xml @@ -0,0 +1,48 @@ + + + + cash_invoice_out_form + cash.invoice.out + form + +
+ + + + + + + +
+
+
+
+
+ +
diff --git a/pos_session_pay_invoice/README.rst b/pos_session_pay_invoice/README.rst new file mode 100644 index 00000000..e8585e61 --- /dev/null +++ b/pos_session_pay_invoice/README.rst @@ -0,0 +1,56 @@ +.. image:: https://img.shields.io/badge/licence-LGPL--3-blue.svg + :alt: License: LGPL-3 + +======================== +Account cash Pay invoice +======================== + +This modules allows to pay an existing Supplier Invoice / Customer Refund, or +to collect payment for an existing Customer Invoice, using bank statements. + + +Usage +===== + +#. Go to *Accounting / Dashboard* and create and/or open an existing + bank statement. +#. Press the button **Pay Invoice** to pay a Supplier Invoice or a Customer + Refund. You will need to select the expected Journal +#. Select **Collect Payment from Invoice** in to receive a payment of an + existing Customer Invoice or a Supplier Refund. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/repo/github-com-oca-pos-184 + + +Known issues / Roadmap +====================== + +* Cannot pay invoices in a different currency than that defined in the journal + associated to the payment method used to pay/collect payment. + + +Credits +======= + +Contributors +------------ + +* Enric Tobella + + +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 http://odoo-community.org. diff --git a/pos_session_pay_invoice/__init__.py b/pos_session_pay_invoice/__init__.py new file mode 100644 index 00000000..577a9637 --- /dev/null +++ b/pos_session_pay_invoice/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from . import wizard diff --git a/pos_session_pay_invoice/__manifest__.py b/pos_session_pay_invoice/__manifest__.py new file mode 100644 index 00000000..6531bf39 --- /dev/null +++ b/pos_session_pay_invoice/__manifest__.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2017 Creu Blanca +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +{ + 'name': 'POS Pay invoice', + 'version': '10.0.1.0.0', + 'category': 'Point Of Sale', + 'author': "Creu Blanca," + "Odoo Community Association (OCA)", + 'website': 'https://github.com/OCA/pos', + 'summary': 'Pay and receive invoices from PoS Session', + "license": "LGPL-3", + 'depends': [ + "point_of_sale", "account_cash_invoice" + ], + 'data': [ + "wizard/cash_invoice_out.xml", + "wizard/cash_invoice_in.xml", + "views/pos_session.xml", + "views/account_bank_statement.xml", + ], +} diff --git a/pos_session_pay_invoice/static/description/icon.png b/pos_session_pay_invoice/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/pos_session_pay_invoice/tests/__init__.py b/pos_session_pay_invoice/tests/__init__.py new file mode 100644 index 00000000..510806cb --- /dev/null +++ b/pos_session_pay_invoice/tests/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from . import test_pay_invoice diff --git a/pos_session_pay_invoice/tests/test_pay_invoice.py b/pos_session_pay_invoice/tests/test_pay_invoice.py new file mode 100644 index 00000000..4cd5a09a --- /dev/null +++ b/pos_session_pay_invoice/tests/test_pay_invoice.py @@ -0,0 +1,86 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Creu Blanca +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from odoo.tests import common + + +class TestSessionPayInvoice(common.TransactionCase): + def setUp(self): + super(TestSessionPayInvoice, self).setUp() + self.company = self.env.ref('base.main_company') + partner = self.env.ref('base.partner_demo') + self.invoice_out = self.env['account.invoice'].create({ + 'company_id': self.company.id, + 'partner_id': partner.id, + 'date_invoice': '2016-03-12', + 'type': 'out_invoice', + }) + account = self.env['account.account'].create({ + 'code': 'test_cash_pay_invoice', + 'company_id': self.company.id, + 'name': 'Test', + 'user_type_id': self.env.ref( + 'account.data_account_type_revenue').id + }) + self.env['account.invoice.line'].create({ + 'product_id': self.env.ref('product.product_delivery_02').id, + 'invoice_id': self.invoice_out.id, + 'account_id': account.id, + 'name': 'Producto de prueba', + 'quantity': 1.0, + 'price_unit': 100.0, + }) + self.invoice_out._onchange_invoice_line_ids() + self.invoice_out.action_invoice_open() + self.invoice_out.number = '2999/99999' + self.invoice_in = self.env['account.invoice'].create({ + 'partner_id': partner.id, + 'company_id': self.company.id, + 'type': 'in_invoice', + 'date_invoice': '2016-03-12', + }) + self.env['account.invoice.line'].create({ + 'product_id': self.env.ref('product.product_delivery_02').id, + 'invoice_id': self.invoice_in.id, + 'name': 'Producto de prueba', + 'account_id': account.id, + 'quantity': 1.0, + 'price_unit': 100.0, + }) + self.invoice_in._onchange_invoice_line_ids() + self.invoice_in.action_invoice_open() + self.invoice_in.number = '2999/99999' + self.config = self.env.ref('point_of_sale.pos_config_main') + self.config.cash_control = True + + def test_pos_invoice(self): + self.config.open_session_cb() + session = self.config.current_session_id + self.assertIsNotNone(session.statement_ids) + session.action_pos_session_open() + in_invoice = self.env['cash.invoice.in'].with_context( + active_ids=session.ids, active_model='pos.session' + ).create({ + 'invoice_id': self.invoice_in.id, + 'amount': 100.0 + }) + in_invoice.run() + out_invoice = self.env['cash.invoice.out'].with_context( + active_ids=session.ids, active_model='pos.session' + ).create({ + 'invoice_id': self.invoice_out.id, + 'amount': 75.0 + }) + out_invoice.run() + box = self.env['cash.box.in'].with_context( + active_ids=session.ids, active_model='pos.session' + ).create({ + 'name': "Testing", + 'amount': 25.0 + }) + box.run() + session.action_pos_session_closing_control() + session.action_pos_session_closing_control() + self.assertEqual(self.invoice_out.residual, 25.) + self.assertEqual(self.invoice_in.residual, 0.) diff --git a/pos_session_pay_invoice/views/account_bank_statement.xml b/pos_session_pay_invoice/views/account_bank_statement.xml new file mode 100644 index 00000000..95b1170d --- /dev/null +++ b/pos_session_pay_invoice/views/account_bank_statement.xml @@ -0,0 +1,21 @@ + + + + + diff --git a/pos_session_pay_invoice/views/pos_session.xml b/pos_session_pay_invoice/views/pos_session.xml new file mode 100644 index 00000000..38e2e71d --- /dev/null +++ b/pos_session_pay_invoice/views/pos_session.xml @@ -0,0 +1,43 @@ + + + + pos.config.kanban.view + pos.config + + + + + + + + + pos.session.form.view + pos.session + + + + + + + + + diff --git a/pos_session_pay_invoice/wizard/__init__.py b/pos_session_pay_invoice/wizard/__init__.py new file mode 100644 index 00000000..030f06a1 --- /dev/null +++ b/pos_session_pay_invoice/wizard/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from . import cash_invoice_in +from . import cash_invoice_out diff --git a/pos_session_pay_invoice/wizard/cash_invoice_in.py b/pos_session_pay_invoice/wizard/cash_invoice_in.py new file mode 100644 index 00000000..6c77fcdb --- /dev/null +++ b/pos_session_pay_invoice/wizard/cash_invoice_in.py @@ -0,0 +1,56 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2017 Creu Blanca +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from odoo import api, models, _ +from odoo.exceptions import UserError + + +class CashInvoiceIn(models.TransientModel): + _inherit = 'cash.invoice.in' + + def default_company(self, active_model, active_ids): + if active_model == 'pos.session': + active = self.env[active_model].browse(active_ids) + return active[0].config_id.company_id + return super(CashInvoiceIn, self).default_company( + active_model, active_ids + ) + + def default_journals(self, active_model, active_ids): + if active_model == 'pos.session': + active = self.env[active_model].browse(active_ids) + if not active.cash_register_id: + raise UserError(_( + "There is no cash register for this Pos session" + )) + return active.cash_register_id.journal_id + return super(CashInvoiceIn, self).default_journals( + active_model, active_ids + ) + + def default_currency(self, active_model, active_ids): + if active_model == 'pos.session': + journal = self._default_journal() + if journal.currency_id: + return journal.currency_id + return super(CashInvoiceIn, self).default_currency( + active_model, active_ids + ) + + @api.multi + def run(self): + active_model = self.env.context.get('active_model', False) + active_ids = self.env.context.get('active_ids', False) + if active_model == 'pos.session': + bank_statements = [ + session.statement_ids.filtered( + lambda r: r.journal_id.id == self.journal_id.id + ) + for session in self.env[active_model].browse(active_ids) + ] + if not bank_statements: + raise UserError(_('Bank Statement was not found')) + return self._run(bank_statements) + else: + return super(CashInvoiceIn, self).run() diff --git a/pos_session_pay_invoice/wizard/cash_invoice_in.xml b/pos_session_pay_invoice/wizard/cash_invoice_in.xml new file mode 100644 index 00000000..fb1483cf --- /dev/null +++ b/pos_session_pay_invoice/wizard/cash_invoice_in.xml @@ -0,0 +1,12 @@ + + + + diff --git a/pos_session_pay_invoice/wizard/cash_invoice_out.py b/pos_session_pay_invoice/wizard/cash_invoice_out.py new file mode 100644 index 00000000..19bee735 --- /dev/null +++ b/pos_session_pay_invoice/wizard/cash_invoice_out.py @@ -0,0 +1,53 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2017 Creu Blanca +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). + +from odoo import api, models, _ +from odoo.exceptions import UserError + + +class CashInvoiceOut(models.TransientModel): + _inherit = 'cash.invoice.out' + + def default_company(self, active_model, active_ids): + if active_model == 'pos.session': + active = self.env[active_model].browse(active_ids) + return active[0].config_id.company_id + return super(CashInvoiceOut, self).default_company( + active_model, active_ids + ) + + def default_currency(self, active_model, active_ids): + if active_model == 'pos.session': + journal = self._default_journal() + if journal.currency_id: + return journal.currency_id + return super(CashInvoiceOut, self).default_currency( + active_model, active_ids + ) + + def default_journals(self, active_model, active_ids): + if active_model == 'pos.session': + active = self.env[active_model].browse(active_ids) + return self.env['account.journal'].browse( + [r.journal_id.id for r in active.statement_ids]) + return super(CashInvoiceOut, self).default_journals( + active_model, active_ids + ) + + @api.multi + def run(self): + active_model = self.env.context.get('active_model', False) + active_ids = self.env.context.get('active_ids', False) + if active_model == 'pos.session': + bank_statements = [ + session.statement_ids.filtered( + lambda r: r.journal_id.id == self.journal_id.id + ) + for session in self.env[active_model].browse(active_ids) + ] + if not bank_statements: + raise UserError(_('Bank Statement was not found')) + return self._run(bank_statements) + else: + return super(CashInvoiceOut, self).run() diff --git a/pos_session_pay_invoice/wizard/cash_invoice_out.xml b/pos_session_pay_invoice/wizard/cash_invoice_out.xml new file mode 100644 index 00000000..0af983ef --- /dev/null +++ b/pos_session_pay_invoice/wizard/cash_invoice_out.xml @@ -0,0 +1,12 @@ + + + +