Skip to content

Commit

Permalink
Merge remote-tracking branch 'hbrunn/8.0-lettermgmt' into 8.0
Browse files Browse the repository at this point in the history
Conflicts:
	lettermgmt/__openerp__.py
	placeholder/__openerp__.py

Resolved by adding OCA as a module author and removing placeholder/__openerp__.py
  • Loading branch information
StefanRijnhart committed Mar 22, 2015
2 parents 459cbbb + 42ee797 commit 31c0d06
Show file tree
Hide file tree
Showing 31 changed files with 1,063 additions and 717 deletions.
41 changes: 0 additions & 41 deletions __unported__/lettermgmt/letter_history.py

This file was deleted.

49 changes: 0 additions & 49 deletions __unported__/lettermgmt/letter_history_view.xml

This file was deleted.

170 changes: 0 additions & 170 deletions __unported__/lettermgmt/res_letter.py

This file was deleted.

35 changes: 35 additions & 0 deletions lettermgmt/README.rst
@@ -0,0 +1,35 @@
Letter Management
=================

Using this module you can track Incoming / Outgoing letters, parcels,
registered documents or any other paper documents that are important for your
company to keep track of.

Credits
=======

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

* Holger Brunn <hbrunn@therp.nl>
* Sandy Carter <sandy.carter@savoirfairelinux.com>
* Parthiv Patel, Tech Receptives (Original 6.0 Author)

Icon
----

http://commons.wikimedia.org/wiki/File:Kontact_Oxygen.svg

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.

Expand Up @@ -20,10 +20,4 @@
#
###############################################################################

from . import letter_class
from . import letter_folder
from . import res_letter
from . import letter_type
from . import letter_reassignment
from . import letter_history
from . import letter_channel
from . import models
Expand Up @@ -22,44 +22,30 @@

{
'name': 'Letter Management',
'version': '0.1',
'version': '1.2',
'author': "Savoir-faire Linux,Odoo Community Association (OCA)",
'maintainer': 'Savoir-faire Linux',
'website': 'http://www.savoirfairelinux.com',
'license': 'AGPL-3',
'category': 'Social Network',
'category': 'Customer Relationship Management',
'summary': 'Track letters, parcels, registered documents',
'description': """
Letter Management
=================
Using this module you can track Incoming / Outgoing letters, parcels, registered documents
or any other paper documents that are important for company to keep track of.
Contributors
------------
* Sandy Carter <sandy.carter@savoirfairelinux.com>
* Parthiv Patel, Tech Receptives (Original 6.0 Author)
""",
'depends': ['mail'],
'external_dependencies': {
'python': [],
},
'data': [
"res_letter_view.xml",
"letter_folder_view.xml",
"letter_channel_view.xml",
"letter_class_view.xml",
"letter_history_view.xml",
"letter_reassignment_view.xml",
"letter_type_view.xml",
"letter_sequence.xml",
"views/res_letter_view.xml",
"views/letter_folder_view.xml",
"views/letter_channel_view.xml",
"views/letter_class_view.xml",
"views/letter_reassignment_view.xml",
"views/letter_type_view.xml",
"data/letter_sequence.xml",
'security/ir.model.access.csv',
],
'demo': ["letter_demo.xml"],
'demo': ["data/letter_demo.xml"],
'test': [],
'installable': False,
'installable': True,
'auto_install': False,
}

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 31c0d06

Please sign in to comment.