From c677aefb5c0592bdf88db17ced00e249279f65a5 Mon Sep 17 00:00:00 2001 From: aoliva Date: Tue, 23 Apr 2024 10:06:18 +0200 Subject: [PATCH 1/9] =?UTF-8?q?Creaci=C3=B3=20dashboard=20per=20powermail?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __terp__.py | 1 + ...-0001_migration_add_dashboard_powermail.py | 23 ++ poweremail_dashboard.xml | 251 ++++++++++++++++++ 3 files changed, 275 insertions(+) create mode 100644 migrations/5.0.24.5.0/post-0001_migration_add_dashboard_powermail.py create mode 100644 poweremail_dashboard.xml diff --git a/__terp__.py b/__terp__.py index a12e65e..a7d0c7a 100644 --- a/__terp__.py +++ b/__terp__.py @@ -65,6 +65,7 @@ 'poweremail_send_wizard.xml', 'poweremail_mailbox_view.xml', 'poweremail_serveraction_view.xml', + 'poweremail_dashboard.xml', 'security/ir.model.access.csv', ], "installable": True, diff --git a/migrations/5.0.24.5.0/post-0001_migration_add_dashboard_powermail.py b/migrations/5.0.24.5.0/post-0001_migration_add_dashboard_powermail.py new file mode 100644 index 0000000..8d17c32 --- /dev/null +++ b/migrations/5.0.24.5.0/post-0001_migration_add_dashboard_powermail.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +import logging +import pooler +from oopgrade.oopgrade import load_data, load_data_records + + +def up(cursor, installed_version): + if not installed_version: + return + logger = logging.getLogger('openerp.migration') + logger.info("Creating pooler") + pool = pooler.get_pool(cursor.dbname) + + logger.info("Updating XML wizard/wizard_accions_massives_lot_view.xml") + load_data( + cursor, 'poweremail', 'poweremail_dashboard.xml', idref=None, mode='update' + ) + logger.info("XMLs succesfully updated.") + +def down(cursor, installed_version): + pass + +migrate = up \ No newline at end of file diff --git a/poweremail_dashboard.xml b/poweremail_dashboard.xml new file mode 100644 index 0000000..07c1623 --- /dev/null +++ b/poweremail_dashboard.xml @@ -0,0 +1,251 @@ + + + + + + Poweremail + ir.actions.act_window + dashboard + dashboard,form + board.board + + + + Poweremail Dashboard + + + + + + + + + + + Total Email enviats + poweremail.mailbox + graph + + + + + + + + + Total Emails enviats + ir.actions.act_window + form + graph,tree,form + + poweremail.mailbox + [('folder', '=', 'sent')] + + + + graph + + + + + Total Emails enviats + + + + + + + + + + Emails en error + poweremail.mailbox + graph + + + + + + + + + Emails en error + ir.actions.act_window + form + graph,tree,form + + poweremail.mailbox + [('folder','=','error')] + + + + graph + + + + + Emails en error + + + + + + + + + + Email enviats avui + poweremail.mailbox + graph + + + + + + + + + Email enviats avui + ir.actions.act_window + form + graph,tree,form + + poweremail.mailbox + [('folder', '=', 'sent')] + + + + graph + + + + + Emails enviats avui + + + + + + + + + + Email Rebuts avui + poweremail.mailbox + graph + + + + + + + + + Emails rebuts avui + ir.actions.act_window + form + graph,tree,form + + poweremail.mailbox + [('date_mail', '>=', datetime.datetime.today().strftime('%Y-%m-%d 00:00:00')), ('folder','=','sent')] + + + + graph + + + + + Emails rebuts avui + + + + + + + + + + Email per enviar + poweremail.mailbox + graph + + + + + + + + + Email per enviar + ir.actions.act_window + form + graph,tree,form + + poweremail.mailbox + [('folder', '=', 'outbox')] + + + + graph + + + + + Emails per enviar + + + + + + + + + + Emails enviats/rebuts els últims 60 dies + poweremail.mailbox + graph + + + + + + + + + + + Emails enviats/rebuts els últims 60 dies + ir.actions.act_window + form + graph,tree,form + + poweremail.mailbox + [] + + + + graph + + + + + Emails enviats/rebuts els últims 60 dies + + + + + + + \ No newline at end of file From 5d1d3c271bee11c64066f5aed5d6703c72883a70 Mon Sep 17 00:00:00 2001 From: aoliva Date: Fri, 3 May 2024 14:57:50 +0200 Subject: [PATCH 2/9] =?UTF-8?q?Fix=20dashboard=20i=20script=20migraci?= =?UTF-8?q?=C3=B3=20modificacio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../post-0002_fix_dashboard_powermail.py | 29 +++++++++++++++++++ poweremail_dashboard.xml | 29 +++++++++---------- 2 files changed, 43 insertions(+), 15 deletions(-) create mode 100644 migrations/5.0.24.5.0/post-0002_fix_dashboard_powermail.py diff --git a/migrations/5.0.24.5.0/post-0002_fix_dashboard_powermail.py b/migrations/5.0.24.5.0/post-0002_fix_dashboard_powermail.py new file mode 100644 index 0000000..886b56e --- /dev/null +++ b/migrations/5.0.24.5.0/post-0002_fix_dashboard_powermail.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +import logging +from oopgrade.oopgrade import load_data, load_data_records + + +def up(cursor, installed_version): + if not installed_version: + return + + + logger = logging.getLogger('openerp.migration') + + logger.info("Updating XML's") + list_of_records = [ + "view_poweremail_enviats_avui", + "action_poweremail_enviats_avui", + "action_poweremail_emails_rebuts_avui", + "view_poweremail_emails_ultims_60_dies", + "action_poweremail_emails_ultims_60_dies" + ] + load_data_records( + cursor, 'poweremail', 'poweremail_dashboard.xml', list_of_records, mode='update' + ) + logger.info("XMLs succesfully updated.") + +def down(cursor, installed_version): + pass + +migrate = up \ No newline at end of file diff --git a/poweremail_dashboard.xml b/poweremail_dashboard.xml index 07c1623..5c082ef 100644 --- a/poweremail_dashboard.xml +++ b/poweremail_dashboard.xml @@ -101,7 +101,7 @@ - + Email enviats avui poweremail.mailbox graph @@ -113,26 +113,26 @@ - + Email enviats avui ir.actions.act_window form graph,tree,form poweremail.mailbox - [('folder', '=', 'sent')] + [('date_mail', '>=', datetime.datetime.today().strftime('%Y-%m-%d 00:00:00')), ('folder','=','sent')] - + graph - - + + - + Emails enviats avui - + @@ -157,7 +157,7 @@ graph,tree,form poweremail.mailbox - [('date_mail', '>=', datetime.datetime.today().strftime('%Y-%m-%d 00:00:00')), ('folder','=','sent')] + [('date_mail', '>=', datetime.datetime.today().strftime('%Y-%m-%d 00:00:00')), ('folder','=','inbox')] @@ -211,17 +211,16 @@ - + Emails enviats/rebuts els últims 60 dies poweremail.mailbox graph - - - - + + + @@ -232,7 +231,7 @@ graph,tree,form poweremail.mailbox - [] + [('folder','in',['sent','inbox']),('date_mail','>=',((datetime.datetime.today()-datetime.timedelta(days=60)).strftime('%Y-%m-%d')))] From 410dfefba6c3feb32d9fb7504212850903a448db Mon Sep 17 00:00:00 2001 From: aoliva Date: Wed, 8 May 2024 09:11:13 +0200 Subject: [PATCH 3/9] =?UTF-8?q?Script=20migraci=C3=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- migrations/5.0.24.5.0/post-0002_fix_dashboard_powermail.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/migrations/5.0.24.5.0/post-0002_fix_dashboard_powermail.py b/migrations/5.0.24.5.0/post-0002_fix_dashboard_powermail.py index 886b56e..e343a11 100644 --- a/migrations/5.0.24.5.0/post-0002_fix_dashboard_powermail.py +++ b/migrations/5.0.24.5.0/post-0002_fix_dashboard_powermail.py @@ -14,9 +14,8 @@ def up(cursor, installed_version): list_of_records = [ "view_poweremail_enviats_avui", "action_poweremail_enviats_avui", - "action_poweremail_emails_rebuts_avui", - "view_poweremail_emails_ultims_60_dies", - "action_poweremail_emails_ultims_60_dies" + "board_poweremail_enviats_avui", + "view_poweremail_emails_ultims_60_dies" ] load_data_records( cursor, 'poweremail', 'poweremail_dashboard.xml', list_of_records, mode='update' From 1c230c98d015a9e5653f154d673b408eaacc880f Mon Sep 17 00:00:00 2001 From: aoliva Date: Fri, 10 May 2024 14:52:01 +0200 Subject: [PATCH 4/9] fix script migracio --- .../5.0.24.5.0/post-0002_fix_dashboard_powermail.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/migrations/5.0.24.5.0/post-0002_fix_dashboard_powermail.py b/migrations/5.0.24.5.0/post-0002_fix_dashboard_powermail.py index e343a11..0baa14c 100644 --- a/migrations/5.0.24.5.0/post-0002_fix_dashboard_powermail.py +++ b/migrations/5.0.24.5.0/post-0002_fix_dashboard_powermail.py @@ -1,21 +1,24 @@ # -*- coding: utf-8 -*- import logging -from oopgrade.oopgrade import load_data, load_data_records - +import pooler +from oopgrade.oopgrade import load_data_records def up(cursor, installed_version): if not installed_version: return - logger = logging.getLogger('openerp.migration') + logger.info("Creating pooler") + pool = pooler.get_pool(cursor.dbname) + logger.info("Updating XML's") list_of_records = [ - "view_poweremail_enviats_avui", "action_poweremail_enviats_avui", "board_poweremail_enviats_avui", - "view_poweremail_emails_ultims_60_dies" + "action_poweremail_emails_rebuts_avui", + "view_poweremail_emails_ultims_60_dies", + "action_poweremail_emails_ultims_60_dies" ] load_data_records( cursor, 'poweremail', 'poweremail_dashboard.xml', list_of_records, mode='update' From 1479466dc1c2f3a3362d32b62d1b65cbea400449 Mon Sep 17 00:00:00 2001 From: aoliva Date: Mon, 20 May 2024 11:10:59 +0200 Subject: [PATCH 5/9] Fix dashboard grafica emails enviats --- poweremail_dashboard.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/poweremail_dashboard.xml b/poweremail_dashboard.xml index 5c082ef..6d8fccc 100644 --- a/poweremail_dashboard.xml +++ b/poweremail_dashboard.xml @@ -220,7 +220,7 @@ - + From df46193b725b4fbd1d215ed6ea7049f4296024a9 Mon Sep 17 00:00:00 2001 From: aoliva Date: Thu, 27 Jun 2024 17:48:11 +0200 Subject: [PATCH 6/9] =?UTF-8?q?Modificacion=20drafts=20en=20per=20enviar?= =?UTF-8?q?=20inclusi=C3=B3n=20board=20en=20terp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __terp__.py | 5 ++++- poweremail_dashboard.xml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/__terp__.py b/__terp__.py index a7d0c7a..fa738dd 100644 --- a/__terp__.py +++ b/__terp__.py @@ -29,7 +29,10 @@ "author" : "Sharoon Thomas, Openlabs", "website" : "http://openlabs.co.in/blog/post/poweremail/", "category" : "Added functionality", - "depends" : ['base'], + "depends" : [ + 'base', + 'board' + ], "description": """ Power Email - extends the most Power ful open source ERP with email which powers the world today. diff --git a/poweremail_dashboard.xml b/poweremail_dashboard.xml index 6d8fccc..817b0b4 100644 --- a/poweremail_dashboard.xml +++ b/poweremail_dashboard.xml @@ -194,7 +194,7 @@ graph,tree,form poweremail.mailbox - [('folder', '=', 'outbox')] + [('folder', '=', 'drafts')] From 63b8f9d63acb69b6861b7fb707bcbc7d825861ce Mon Sep 17 00:00:00 2001 From: Iker Paz Bustins Date: Fri, 12 Jul 2024 11:42:15 +0200 Subject: [PATCH 7/9] fix code migration script --- ...-0001_migration_add_dashboard_powermail.py | 11 ++++--- .../post-0002_fix_dashboard_powermail.py | 31 ------------------- 2 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 migrations/5.0.24.5.0/post-0002_fix_dashboard_powermail.py diff --git a/migrations/5.0.24.5.0/post-0001_migration_add_dashboard_powermail.py b/migrations/5.0.24.5.0/post-0001_migration_add_dashboard_powermail.py index 8d17c32..abc67a1 100644 --- a/migrations/5.0.24.5.0/post-0001_migration_add_dashboard_powermail.py +++ b/migrations/5.0.24.5.0/post-0001_migration_add_dashboard_powermail.py @@ -1,23 +1,24 @@ # -*- coding: utf-8 -*- import logging -import pooler from oopgrade.oopgrade import load_data, load_data_records def up(cursor, installed_version): if not installed_version: return + logger = logging.getLogger('openerp.migration') - logger.info("Creating pooler") - pool = pooler.get_pool(cursor.dbname) - logger.info("Updating XML wizard/wizard_accions_massives_lot_view.xml") + ##UPATAR UN XML SENCER## + logger.info("Updating XML poweremail_dashboard.xml") load_data( - cursor, 'poweremail', 'poweremail_dashboard.xml', idref=None, mode='update' + cursor, 'poweremail', 'poweremail_dashboard.xml', idref=None, mode='init' ) logger.info("XMLs succesfully updated.") + def down(cursor, installed_version): pass + migrate = up \ No newline at end of file diff --git a/migrations/5.0.24.5.0/post-0002_fix_dashboard_powermail.py b/migrations/5.0.24.5.0/post-0002_fix_dashboard_powermail.py deleted file mode 100644 index 0baa14c..0000000 --- a/migrations/5.0.24.5.0/post-0002_fix_dashboard_powermail.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -import logging -import pooler -from oopgrade.oopgrade import load_data_records - -def up(cursor, installed_version): - if not installed_version: - return - - logger = logging.getLogger('openerp.migration') - - logger.info("Creating pooler") - pool = pooler.get_pool(cursor.dbname) - - logger.info("Updating XML's") - list_of_records = [ - "action_poweremail_enviats_avui", - "board_poweremail_enviats_avui", - "action_poweremail_emails_rebuts_avui", - "view_poweremail_emails_ultims_60_dies", - "action_poweremail_emails_ultims_60_dies" - ] - load_data_records( - cursor, 'poweremail', 'poweremail_dashboard.xml', list_of_records, mode='update' - ) - logger.info("XMLs succesfully updated.") - -def down(cursor, installed_version): - pass - -migrate = up \ No newline at end of file From 03fed0e68e4e27eb6fcea55b0e9fb79beec858fa Mon Sep 17 00:00:00 2001 From: aoliva Date: Fri, 19 Jul 2024 09:36:49 +0200 Subject: [PATCH 8/9] fix id poweremail dashboard correus enviats avui --- poweremail_dashboard.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/poweremail_dashboard.xml b/poweremail_dashboard.xml index 817b0b4..0714f7e 100644 --- a/poweremail_dashboard.xml +++ b/poweremail_dashboard.xml @@ -122,7 +122,7 @@ poweremail.mailbox [('date_mail', '>=', datetime.datetime.today().strftime('%Y-%m-%d 00:00:00')), ('folder','=','sent')] - + graph From 48738768ac5b0081488841bb811f250658c4df52 Mon Sep 17 00:00:00 2001 From: Aleix O Date: Tue, 31 Dec 2024 09:48:36 +0100 Subject: [PATCH 9/9] Fix: mejorar dashboard poweremail --- poweremail_dashboard.xml | 75 ++++++++++------------------------------ 1 file changed, 19 insertions(+), 56 deletions(-) diff --git a/poweremail_dashboard.xml b/poweremail_dashboard.xml index 0714f7e..fd67dc8 100644 --- a/poweremail_dashboard.xml +++ b/poweremail_dashboard.xml @@ -25,43 +25,6 @@ - - - - Total Email enviats - poweremail.mailbox - graph - - - - - - - - - Total Emails enviats - ir.actions.act_window - form - graph,tree,form - - poweremail.mailbox - [('folder', '=', 'sent')] - - - - graph - - - - - Total Emails enviats - - - - - - @@ -176,7 +139,7 @@ - Email per enviar + Emails per enviar poweremail.mailbox graph @@ -188,13 +151,13 @@ - Email per enviar + Emails per enviar ir.actions.act_window form graph,tree,form poweremail.mailbox - [('folder', '=', 'drafts')] + [('folder', '=', 'outbox')] @@ -210,41 +173,41 @@ - + - - Emails enviats/rebuts els últims 60 dies + + Emails en esborrany poweremail.mailbox graph - - - + + - - Emails enviats/rebuts els últims 60 dies + + Emails en esborrany ir.actions.act_window form graph,tree,form poweremail.mailbox - [('folder','in',['sent','inbox']),('date_mail','>=',((datetime.datetime.today()-datetime.timedelta(days=60)).strftime('%Y-%m-%d')))] + [('folder', '=', 'drafts')] - + graph - - + + - - Emails enviats/rebuts els últims 60 dies + + Emails en esborrany - + - + \ No newline at end of file