Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8.0 move sale payment method #172

Merged
merged 55 commits into from
Dec 1, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
ea9fe99
[REF] split sale_quick_payment in 2 modules: sale_payment method is t…
guewen Mar 26, 2013
3726efa
[REF] move dependency on sale_exceptions from sale_payment_method to …
guewen Mar 26, 2013
162d681
[FIX] missing dependency on sale
guewen Mar 26, 2013
3fd045d
[IMP] the workflow to use is set by an onchange when the payment meth…
guewen Mar 27, 2013
739e487
[CHG] move the part of the view which displays the payments from sale…
guewen Mar 27, 2013
6c4172d
[IMP] rename add_payment_with_terms to automatic_payment, use the pay…
guewen Mar 28, 2013
48e04d2
[FIX] typo
guewen Mar 28, 2013
b6ff5ac
[IMP] improve the view of payment methods to be more helpful
guewen Apr 3, 2013
4ad6fce
[FIX] rename 'E-Commerce Payment Methods' to 'Payment Methods' becaus…
guewen Apr 17, 2013
4daff6b
[ADD] sale_payment_method: french translation
guewen May 2, 2013
50a2d5c
[ADD] sale_payment_method: button on the sale order to open the autom…
guewen May 2, 2013
b48d9d2
[FIX] fix bug to due previous refactor, compute correctly the amount …
sebastienbeau Sep 1, 2013
d442872
[REF] start to refactor sale_payment_method, the aim is to link the s…
sebastienbeau Aug 10, 2013
0a1a7d4
[FIX] fr_FR.po files not loaded, should be named fr.po
guewen Sep 25, 2013
4c27d7e
[CHG] removed the trailing # in the headers
guewen Sep 26, 2013
7887f44
[FIX] use explicit relative import
guewen Sep 26, 2013
978ec56
[FIX] misleading module name
guewen Sep 26, 2013
1454451
[FIX] misleading module name in views names
guewen Sep 26, 2013
78003f8
[FIX] imports
guewen Sep 26, 2013
72c5aa8
[IMP] sale_payment_method add the possibility to add the description …
sebastienbeau Sep 20, 2013
5307f7a
Add multicompany support for payment methods
Dec 5, 2013
451899d
[FIX] description is not required in the method and it has been added…
guewen Jan 14, 2014
610a5f0
[FIX] the 'View Automatic Payments' button still except moves but 'pa…
guewen Jan 15, 2014
fd89dff
[FIX] No migration is required if not previous version
lmignon Feb 14, 2014
9e3fa60
[FIX] name field on payment_method should be required
Mar 13, 2014
24e77c8
[FIX] No migration is required if not previous version
lmignon Mar 14, 2014
3f856aa
[FIX] name field on payment_method should be required
Mar 21, 2014
6bff0c7
Tranlations es for modules
albertofl Jun 24, 2014
b712f1b
set the flag 'installable' to False on the modules
guewen Jul 7, 2014
9c3589c
move modules to migrate in __unported__
guewen Jul 7, 2014
f26e9da
Fix flake8 errors
guewen Jul 7, 2014
731f367
Shorten long lines with > 79 chars
guewen Aug 22, 2014
aefcf42
Redefining name 'fields' from outer scope
guewen Nov 20, 2014
9579101
Merge 7.0 into 8.0
guewen Nov 20, 2014
3c23c1a
Move sale_payment_method in root folder
guewen Feb 12, 2015
00761da
Better definition of fields
guewen Feb 13, 2015
7abe206
Use exceptions.Warning instead of osv.except_osv
guewen Feb 13, 2015
9ce00d0
Remove unused methods
guewen Feb 13, 2015
0f4dc1d
Migrate to new API
guewen Feb 13, 2015
f58cbfb
Add Readme
guewen Feb 13, 2015
7995dd0
Move the field payment_method in 'Other Informations'
guewen Feb 13, 2015
d66b849
Corrections after tests with erppeek
guewen Feb 13, 2015
f5dc40c
Fix pep8 in __openerp__
guewen Feb 13, 2015
226a174
Update translations
guewen Feb 13, 2015
5aea69d
Typo in a help message
guewen Feb 19, 2015
0e30a2c
Method returns 2 move lines, add a final 's'
guewen Feb 19, 2015
dc4d96b
Useless dict returned
guewen Mar 12, 2015
9b459c1
str() not needed
guewen Mar 12, 2015
da7669c
Add comments on the currency conversion
guewen Mar 12, 2015
1388143
Use copy=False on the field rather than copy method
guewen Mar 12, 2015
1469e52
Remove the field sale_order.payment_exists
guewen Mar 23, 2015
59bea19
[FIX] a Many2one in the new api is expecting a recordset
matthieuchoplin Apr 28, 2015
41b93a9
add returns decorator
matthieuchoplin Apr 28, 2015
1fd0d19
[IMP] move file
bguillot Jun 24, 2015
c10a0bf
Merge branch '8.0_move_sale_payment_method' into move_sale_payment_me…
bguillot Jun 24, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions sale_payment_method/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
Sale Payment Method
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add above another row of equal signs, see https://raw.githubusercontent.com/OCA/maintainer-tools/master/template/module/README.rst as reference.

===================

It adds a payment method on the sales orders and allow to register
payments entries on sales orders.

This module is low level and works well with the following modules:
* **Sale Automatic Worflow** and **Sale Payment Method - Automatic Workflow**
the payments created with this module will be automatically reconciled
with the invoices of the sales orders.
* Sale Quick Payment: allows to create the payments with a button on the
sales orders.

Also, the e-commerce connectors such as the **Magento Connector** or
**Prestashop Connector** use it to create the external payments.

Installation
============

Nothing special is required.

Configuration
=============

The payment methods can be configured in **Sales > Configuration >
Sales > Payment Methods**.

Usage
=====

A new field on sales orders allow to select the payment method used on
this sales order.

Known issues / Roadmap
======================

* It accepts only one method per sale order.

Credits
=======

Contributors
------------

* Guewen Baconnier <guewen.baconnier@camptocamp.com>
* Sébastien Beau <sebastien.beau@akretion.com>
* Arthur Vuillard <arthur.vuillard@akretion.com>
* Jan-Philipp Fischer <jan-philipp.fischer@greencoding.de>

Maintainer
----------

.. image:: http://odoo-community.org/logo.png
:alt: Odoo Community Association
:target: http://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.
24 changes: 24 additions & 0 deletions sale_payment_method/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# sale_payment_method for OpenERP
# Copyright (C) 2011 Akretion Sébastien BEAU <sebastien.beau@akretion.com>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################

from . import sale
from . import payment_method
from . import account_move
37 changes: 37 additions & 0 deletions sale_payment_method/__openerp__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# sale_payment_method for OpenERP
# Copyright (C) 2011 Akretion Sébastien BEAU <sebastien.beau@akretion.com>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################

{'name': 'Sale Payment Method',
'version': '0.2.1',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'category': 'Generic Modules/Others',
'license': 'AGPL-3',
'author': "Akretion,Odoo Community Association (OCA)",
'website': 'http://www.akretion.com/',
'depends': ['sale',
],
'data': ['sale_view.xml',
'payment_method_view.xml',
'security/ir.model.access.csv',
'security/rules.xml',
],
'demo': [],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove empty key.

'installable': True,
}
28 changes: 28 additions & 0 deletions sale_payment_method/account_move.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# Author: Guewen Baconnier
# Copyright 2013 Camptocamp SA
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
from openerp import models, fields


class AccountMoveLine(models.Model):
_inherit = 'account.move.line'

sale_ids = fields.Many2many(comodel_name='sale.order',
string='Sales Orders')
138 changes: 138 additions & 0 deletions sale_payment_method/i18n/es.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * sale_payment_method
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-05-02 07:06+0000\n"
"PO-Revision-Date: 2014-06-24 11:55+0100\n"
"Last-Translator: Alberto Garcia <alberto.garcia@factorlibre.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: \n"

#. module: sale_payment_method
#: view:sale.order:0
msgid "Automation Information"
msgstr "Información Automática"

#. module: sale_payment_method
#: help:payment.method,journal_id:0
msgid "If a journal is selected, when a payment is recorded on a backend, payment entries will be created in this journal. "
msgstr "Si un diario es sleccionado, cuando un pago es registrado en el backend, las entradas de los pagos serán creadas en ese diario"

#. module: sale_payment_method
#: view:payment.method:0
msgid ""
"Even if the E-commerce backend receives a payment for a sale order,\n"
" no payment entries will be generated."
msgstr "Incluso si el E-commerce backend recibe un pago de un pedido de venta,"

#. module: sale_payment_method
#: view:payment.method:0
msgid "Default Values"
msgstr "Valores por defecto"

#. module: sale_payment_method
#: model:ir.model,name:sale_payment_method.model_payment_method
#: field:sale.order,payment_method_id:0
msgid "Payment Method"
msgstr "Método de pago"

#. module: sale_payment_method
#: view:sale.order:0
msgid "View Automatic Payment"
msgstr "Ver Pago Automático"

#. module: sale_payment_method
#: field:payment.method,journal_id:0
msgid "Journal"
msgstr "Diario"

#. module: sale_payment_method
#: model:ir.actions.act_window,name:sale_payment_method.act_payment_method_form
#: model:ir.ui.menu,name:sale_payment_method.menu_action_paymetn_method_form
msgid "Payment Methods "
msgstr "Métodos de Pago"

#. module: sale_payment_method
#: field:account.move,order_ids:0
msgid "Sales Orders"
msgstr "Pedidos de venta"

#. module: sale_payment_method
#: view:sale.order:0
msgid "Other Information"
msgstr "Otra información"

#. module: sale_payment_method
#: view:payment.method:0
msgid "Payment Methods"
msgstr "Métodos de pago"

#. module: sale_payment_method
#: field:payment.method,name:0
msgid "Name"
msgstr "Nombre"

#. module: sale_payment_method
#: field:sale.order,payment_ids:0
msgid "Payments Entries"
msgstr "Entradas de pagos"

#. module: sale_payment_method
#: view:payment.method:0
msgid ""
"When the E-commerce backend will receive a payment for a sale order,\n"
" payment entries will be generated in the selected journal."
msgstr "Cuando el E-commerce backend recibe un pago para un pedido de venta,"

#. module: sale_payment_method
#: view:payment.method:0
msgid "Journal for payment"
msgstr "Diario de pago"

#. module: sale_payment_method
#: field:sale.order,residual:0
msgid "Balance"
msgstr "Balance"

#. module: sale_payment_method
#: model:ir.model,name:sale_payment_method.model_account_move
msgid "Account Entry"
msgstr "Apunte Contable"

#. module: sale_payment_method
#: help:payment.method,payment_term_id:0
msgid "Default payment term of a sale order using this method."
msgstr "Forma de pago por defecto de un pedido de venta usado por este método."

#. module: sale_payment_method
#: field:payment.method,payment_term_id:0
msgid "Payment Term"
msgstr "Modo de pago"

#. module: sale_payment_method
#: view:sale.order:0
msgid "Create Invoice"
msgstr "Crear Factura"

#. module: sale_payment_method
#: help:payment.method,name:0
msgid "The name of the method on the backend"
msgstr "El nombre del método en el backend"

#. module: sale_payment_method
#: model:ir.model,name:sale_payment_method.model_sale_order
msgid "Sales Order"
msgstr "Pediso de Ventas"

#. module: sale_payment_method
#: field:sale.order,payment_exists:0
msgid "Has automatic payment"
msgstr "Tiene pago automático"

Loading