From c025cd2a9f96cfb586a94022f1d4c1fb209b1ca3 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 3 Oct 2013 14:10:27 +0800 Subject: [PATCH] IDEMPIERE-1265 Add Adaxa Sales Management. Improve the appearance of the sales rep dashboard. --- .../oracle/201310030605_IDEMPIERE-1265.sql | 46 +++++++++++++++++++ .../201310030605_IDEMPIERE-1265.sql | 43 +++++++++++++++++ .../adempiere/webui/editor/WChartEditor.java | 1 + .../theme/default/css/theme.css.dsp | 5 ++ 4 files changed, 95 insertions(+) create mode 100644 migration/i1.0z/oracle/201310030605_IDEMPIERE-1265.sql create mode 100644 migration/i1.0z/postgresql/201310030605_IDEMPIERE-1265.sql diff --git a/migration/i1.0z/oracle/201310030605_IDEMPIERE-1265.sql b/migration/i1.0z/oracle/201310030605_IDEMPIERE-1265.sql new file mode 100644 index 0000000000..cb199f10b2 --- /dev/null +++ b/migration/i1.0z/oracle/201310030605_IDEMPIERE-1265.sql @@ -0,0 +1,46 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Oct 3, 2013 11:16:28 AM MYT +-- IDEMPIERE-1265 Add Adaxa Sales Management +UPDATE AD_Field SET IsFieldOnly='Y',Updated=TO_DATE('2013-10-03 11:16:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62235 +; + +-- Oct 3, 2013 11:16:46 AM MYT +-- IDEMPIERE-1265 Add Adaxa Sales Management +UPDATE AD_Field SET IsFieldOnly='Y',Updated=TO_DATE('2013-10-03 11:16:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62456 +; + +-- Oct 3, 2013 11:16:56 AM MYT +-- IDEMPIERE-1265 Add Adaxa Sales Management +UPDATE AD_Field SET IsFieldOnly='Y',Updated=TO_DATE('2013-10-03 11:16:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62855 +; + +-- Oct 3, 2013 11:17:08 AM MYT +-- IDEMPIERE-1265 Add Adaxa Sales Management +UPDATE AD_Field SET IsFieldOnly='Y',Updated=TO_DATE('2013-10-03 11:17:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=63001 +; + +-- Oct 3, 2013 11:18:57 AM MYT +-- IDEMPIERE-1265 Add Adaxa Sales Management +UPDATE AD_Field SET ColumnSpan=3,Updated=TO_DATE('2013-10-03 11:18:57','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=63001 +; + +-- Oct 3, 2013 11:19:11 AM MYT +-- IDEMPIERE-1265 Add Adaxa Sales Management +UPDATE AD_Field SET ColumnSpan=3,Updated=TO_DATE('2013-10-03 11:19:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62855 +; + +-- Oct 3, 2013 11:19:25 AM MYT +-- IDEMPIERE-1265 Add Adaxa Sales Management +UPDATE AD_Field SET ColumnSpan=3,Updated=TO_DATE('2013-10-03 11:19:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62456 +; + +-- Oct 3, 2013 11:19:37 AM MYT +-- IDEMPIERE-1265 Add Adaxa Sales Management +UPDATE AD_Field SET ColumnSpan=3,Updated=TO_DATE('2013-10-03 11:19:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62235 +; + +SELECT register_migration_script('201310030605_IDEMPIERE-1265.sql') FROM dual +; + diff --git a/migration/i1.0z/postgresql/201310030605_IDEMPIERE-1265.sql b/migration/i1.0z/postgresql/201310030605_IDEMPIERE-1265.sql new file mode 100644 index 0000000000..b7ec1f7799 --- /dev/null +++ b/migration/i1.0z/postgresql/201310030605_IDEMPIERE-1265.sql @@ -0,0 +1,43 @@ +-- Oct 3, 2013 11:16:28 AM MYT +-- IDEMPIERE-1265 Add Adaxa Sales Management +UPDATE AD_Field SET IsFieldOnly='Y',Updated=TO_TIMESTAMP('2013-10-03 11:16:28','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62235 +; + +-- Oct 3, 2013 11:16:46 AM MYT +-- IDEMPIERE-1265 Add Adaxa Sales Management +UPDATE AD_Field SET IsFieldOnly='Y',Updated=TO_TIMESTAMP('2013-10-03 11:16:46','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62456 +; + +-- Oct 3, 2013 11:16:56 AM MYT +-- IDEMPIERE-1265 Add Adaxa Sales Management +UPDATE AD_Field SET IsFieldOnly='Y',Updated=TO_TIMESTAMP('2013-10-03 11:16:56','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62855 +; + +-- Oct 3, 2013 11:17:08 AM MYT +-- IDEMPIERE-1265 Add Adaxa Sales Management +UPDATE AD_Field SET IsFieldOnly='Y',Updated=TO_TIMESTAMP('2013-10-03 11:17:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=63001 +; + +-- Oct 3, 2013 11:18:57 AM MYT +-- IDEMPIERE-1265 Add Adaxa Sales Management +UPDATE AD_Field SET ColumnSpan=3,Updated=TO_TIMESTAMP('2013-10-03 11:18:57','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=63001 +; + +-- Oct 3, 2013 11:19:11 AM MYT +-- IDEMPIERE-1265 Add Adaxa Sales Management +UPDATE AD_Field SET ColumnSpan=3,Updated=TO_TIMESTAMP('2013-10-03 11:19:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62855 +; + +-- Oct 3, 2013 11:19:25 AM MYT +-- IDEMPIERE-1265 Add Adaxa Sales Management +UPDATE AD_Field SET ColumnSpan=3,Updated=TO_TIMESTAMP('2013-10-03 11:19:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62456 +; + +-- Oct 3, 2013 11:19:37 AM MYT +-- IDEMPIERE-1265 Add Adaxa Sales Management +UPDATE AD_Field SET ColumnSpan=3,Updated=TO_TIMESTAMP('2013-10-03 11:19:37','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Field_ID=62235 +; + +SELECT register_migration_script('201310030605_IDEMPIERE-1265.sql') FROM dual +; + diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WChartEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WChartEditor.java index 515174226e..b39fd240a0 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WChartEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WChartEditor.java @@ -109,6 +109,7 @@ public class WChartEditor extends WEditor Panelchildren pc = new Panelchildren(); panel.appendChild(pc); pc.appendChild(myImage); + pc.setSclass("chart-field"); } int count = 0; diff --git a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp index d23c6a160d..d83146a20e 100644 --- a/org.adempiere.ui.zk/theme/default/css/theme.css.dsp +++ b/org.adempiere.ui.zk/theme/default/css/theme.css.dsp @@ -1930,3 +1930,8 @@ table.z-vbox > tbody > tr > td > table { border-radius: 0px; background-color: #ddd; } + +.chart-field { + padding: 10px; + border: 1px solid lightgray !important; +}