merged multiple heads

README

@@ -1,5 +1,7 @@
+trytond-activity_calendar
+=========================
 
-This Module runs with the Tryton application platform.
+The activity_calendar module of the Tryton application platform.
 
 Installing
 ----------
@@ -9,12 +11,19 @@ See INSTALL
 Support
 -------
 
-If you encounter any problems with this module, please don't hesitate to ask
+For more information or if you encounter any problems with this module,
-questions on the NaN·tic bug tracker, mailing list,
+please contact the programmers at
-wiki or IRC channel:
+
+  Nan-Tic
+  --------------
+  website: http://www.nan-tic.com/
+  email: info@nan-tic.com
+
+If you encounter any problems with Tryton, please don't hesitate to ask
+questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
 
   http://doc.tryton-erp.es/
-  http://bitbucket.org/nantic/tytond-activity_calendar
+  http://bitbucket.org/nantic/trytond-activity_calendar
   http://groups.tryton.org/
   http://wiki.tryton.org/
   irc://irc.freenode.net/tryton

doc/es/index.rst

@@ -0,0 +1,5 @@
+==========================
+Calendarios en actividades
+==========================
+
+El módulo activity calendar le permite visualizar las actividades en calendarios.

doc/index.rst

@@ -0,0 +1,4 @@
+Activity Calendar Module
+########################
+
+The activity calendar module allows to manage activities in calendars.

locale/ca_ES.po

@@ -6,26 +6,24 @@ msgctxt "error:activity.activity:"
 msgid "Activity %s already has an event."
 msgstr "L'activitat %s ja té un esdeveniment."
 
-msgctxt "error:activity.activity:"
-msgid "Activity %s has already and Event"
-msgstr ""
-
-msgctxt "error:activity.activity:"
-msgid "Please select calendar for Activity  %s before create an event"
-msgstr ""
-
 msgctxt "error:activity.activity:"
 msgid "Please select calendar for activity %s before creating an event."
 msgstr ""
 "Si us plau, seleccioneu un calendari per l'activitat %s abans de crear un "
 "esdeveniment."
 
-#, fuzzy
 msgctxt "field:activity.activity,calendar:"
 msgid "Calendar"
 msgstr "Calendari"
 
-#, fuzzy
 msgctxt "field:activity.activity,calendar_event:"
 msgid "Event"
 msgstr "Esdeveniment"
+
+msgctxt "view:activity.activity:"
+msgid "Create Event"
+msgstr "Crea esdeveniment"
+
+msgctxt "view:activity.activity:"
+msgid "Create event for this activity?"
+msgstr "Voleu crear un esdeveniment per aquesta activitat?"

locale/es_ES.po

@@ -6,26 +6,24 @@ msgctxt "error:activity.activity:"
 msgid "Activity %s already has an event."
 msgstr "La actividad %s ya tiene un evento."
 
-msgctxt "error:activity.activity:"
-msgid "Activity %s has already and Event"
-msgstr ""
-
-msgctxt "error:activity.activity:"
-msgid "Please select calendar for Activity  %s before create an event"
-msgstr ""
-
 msgctxt "error:activity.activity:"
 msgid "Please select calendar for activity %s before creating an event."
 msgstr ""
 "Por favor, seleccione un calendario para la actividad %s antes de crear un "
 "evento."
 
-#, fuzzy
 msgctxt "field:activity.activity,calendar:"
 msgid "Calendar"
-msgstr "Calendarios"
+msgstr "Calendario"
 
-#, fuzzy
 msgctxt "field:activity.activity,calendar_event:"
 msgid "Event"
 msgstr "Evento"
+
+msgctxt "view:activity.activity:"
+msgid "Create Event"
+msgstr "Crear evento"
+
+msgctxt "view:activity.activity:"
+msgid "Create event for this activity?"
+msgstr "Desea crear un evento para esta actividad?"

setup.py

@@ -38,7 +38,7 @@ tests_require = ['proteus >= %s.%s, < %s.%s' %
 
 setup(name='%s_%s' % (PREFIX, MODULE),
     version=info.get('version', '0.0.1'),
-    description='',
+    description='Tryton module to manage Activities in calendars',
     long_description=read('README'),
     author='NaN·tic',
     url='http://www.nan-tic.com/',
@@ -50,7 +50,7 @@ setup(name='%s_%s' % (PREFIX, MODULE),
         ],
     package_data={
         'trytond.modules.%s' % MODULE: (info.get('xml', [])
-            + ['tryton.cfg', 'locale/*.po', 'tests/*.rst']),
+            + ['tryton.cfg', 'locale/*.po', 'view/*.xml', 'tests/*.rst']),
         },
     classifiers=[
         'Development Status :: 5 - Production/Stable',

tests/__init__.py

@@ -1,4 +1,6 @@
 # The COPYRIGHT file at the top level of this repository contains the full
 # copyright notices and license terms.
 
-from .test import suite
+from .test_activity_calendar import suite
+
+__all__ = ['suite']

tests/test.py

@@ -1,60 +0,0 @@
-#!/usr/bin/env python
-# The COPYRIGHT file at the top level of this repository contains the full
-# copyright notices and license terms.
-
-import sys
-import os
-DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
-    '..', '..', '..', '..', '..', 'trytond')))
-if os.path.isdir(DIR):
-    sys.path.insert(0, os.path.dirname(DIR))
-
-import unittest
-#import doctest TODO: Remove if no sceneario needed.
-import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends
-from trytond.backend.sqlite.database import Database as SQLiteDatabase
-
-
-class TestCase(unittest.TestCase):
-    '''
-    Test module.
-    '''
-
-    def setUp(self):
-        trytond.tests.test_tryton.install_module('activity_calendar')
-
-    def test0005views(self):
-        '''
-        Test views.
-        '''
-        test_view('activity_calendar')
-
-    def test0006depends(self):
-        '''
-        Test depends.
-        '''
-        test_depends()
-
-
-def doctest_dropdb(test):
-    database = SQLiteDatabase().connect()
-    cursor = database.cursor(autocommit=True)
-    try:
-        database.drop(cursor, ':memory:')
-        cursor.commit()
-    finally:
-        cursor.close()
-
-
-def suite():
-    suite = trytond.tests.test_tryton.suite()
-    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(TestCase))
-    # TODO: remove if no scenario needed.
-    #suite.addTests(doctest.DocFileSuite('scenario_invoice.rst',
-    #        setUp=doctest_dropdb, tearDown=doctest_dropdb, encoding='utf-8',
-    #        optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    return suite
-
-if __name__ == '__main__':
-    unittest.TextTestRunner(verbosity=2).run(suite())

tests/test_activity_calendar.py

@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+import sys
+import os
+DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
+    '..', '..', '..', '..', '..', 'trytond')))
+if os.path.isdir(DIR):
+    sys.path.insert(0, os.path.dirname(DIR))
+
+import unittest
+import trytond.tests.test_tryton
+from trytond.tests.test_tryton import test_view, test_depends
+
+
+class ActivityCalendarTestCase(unittest.TestCase):
+    '''
+    Test Activity Calendar module.
+    '''
+
+    def setUp(self):
+        trytond.tests.test_tryton.install_module('activity_calendar')
+
+    def test0005views(self):
+        '''
+        Test views.
+        '''
+        test_view('activity')
+
+    def test0006depends(self):
+        '''
+        Test depends.
+        '''
+        test_depends()
+
+
+def suite():
+    suite = trytond.tests.test_tryton.suite()
+    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+        ActivityCalendarTestCase))
+    return suite
+
+if __name__ == '__main__':
+    unittest.TextTestRunner(verbosity=2).run(suite())

tryton.cfg

@@ -1,5 +1,5 @@
 [tryton]
-version=2.9.0
+version=3.0.0
 depends:
     activity
     calendar