details: https://code.openbravo.com/erp/devel/pi/rev/8942b6596f0b
changeset: 28131:8942b6596f0b
user: Atul Gaware <atul.gaware <at> openbravo.com>
date: Thu Dec 10 15:10:00 2015 +0530
summary: Fixes Issue 31406:Post button is not hidden in some windows although
Show
Accounting Tabs is set to No
Added missing part to display logic of Posted Button field based on Show
Accounting Flag in session preferences for Payment In - Header Tab,
Payment Out - Header Tab and financial Account Transaction Tab.
Show Accouting flag is renamed as Enable Accounting
diffstat:
src-db/database/sourcedata/AD_FIELD.xml | 6 +-
src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 22
+++++-----
src/org/openbravo/erpCommon/ad_forms/ShowSessionPreferences.html | 4 +-
3 files changed, 16 insertions(+), 16 deletions(-)
diffs (90 lines):
diff -r 78b3579605cd -r 8942b6596f0b src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Mon Dec 14 15:43:50 2015 +0000
+++ b/src-db/database/sourcedata/AD_FIELD.xml Thu Dec 10 15:10:00 2015 +0530
@@ -197457,7 +197457,7 @@
<!--31DD84CF16C547EC9713DCDAD01E03C0-->
<AD_COLUMN_ID><![CDATA[7891269C8420655DE040007F010155CE]]></AD_COLUMN_ID>
<!--31DD84CF16C547EC9713DCDAD01E03C0-->
<IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
<!--31DD84CF16C547EC9713DCDAD01E03C0-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--31DD84CF16C547EC9713DCDAD01E03C0-->
<DISPLAYLOGIC><![CDATA[@Processed@='Y']]></DISPLAYLOGIC>
+<!--31DD84CF16C547EC9713DCDAD01E03C0-->
<DISPLAYLOGIC><![CDATA[@Processed@='Y' & @#ShowAcct@='Y']]></DISPLAYLOGIC>
<!--31DD84CF16C547EC9713DCDAD01E03C0-->
<DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
<!--31DD84CF16C547EC9713DCDAD01E03C0--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--31DD84CF16C547EC9713DCDAD01E03C0--> <SEQNO><![CDATA[140]]></SEQNO>
@@ -227635,7 +227635,7 @@
<!--68BFB03020DB4D599CD407BDB8B09AA1-->
<AD_COLUMN_ID><![CDATA[7891269C83E5655DE040007F010155CE]]></AD_COLUMN_ID>
<!--68BFB03020DB4D599CD407BDB8B09AA1-->
<IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
<!--68BFB03020DB4D599CD407BDB8B09AA1-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--68BFB03020DB4D599CD407BDB8B09AA1-->
<DISPLAYLOGIC><![CDATA[@Status@!'RPAE' & @Status@!'RPVOID' &
@Processed@='Y']]></DISPLAYLOGIC>
+<!--68BFB03020DB4D599CD407BDB8B09AA1-->
<DISPLAYLOGIC><![CDATA[@Status@!'RPAE' & @Status@!'RPVOID' & @Processed@='Y' &
@#ShowAcct@='Y']]></DISPLAYLOGIC>
<!--68BFB03020DB4D599CD407BDB8B09AA1-->
<DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
<!--68BFB03020DB4D599CD407BDB8B09AA1--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--68BFB03020DB4D599CD407BDB8B09AA1--> <SEQNO><![CDATA[120]]></SEQNO>
@@ -236454,7 +236454,7 @@
<!--7C541AC0C767FDD7E040007F01016B4D-->
<AD_COLUMN_ID><![CDATA[7891269C83E5655DE040007F010155CE]]></AD_COLUMN_ID>
<!--7C541AC0C767FDD7E040007F01016B4D-->
<IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
<!--7C541AC0C767FDD7E040007F01016B4D-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--7C541AC0C767FDD7E040007F01016B4D-->
<DISPLAYLOGIC><![CDATA[@Status@!'RPAE' & @Status@!'RPVOID' &
@Processed@='Y']]></DISPLAYLOGIC>
+<!--7C541AC0C767FDD7E040007F01016B4D-->
<DISPLAYLOGIC><![CDATA[@Status@!'RPAE' & @Status@!'RPVOID' & @Processed@='Y' &
@#ShowAcct@='Y']]></DISPLAYLOGIC>
<!--7C541AC0C767FDD7E040007F01016B4D-->
<DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
<!--7C541AC0C767FDD7E040007F01016B4D--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--7C541AC0C767FDD7E040007F01016B4D--> <SEQNO><![CDATA[120]]></SEQNO>
diff -r 78b3579605cd -r 8942b6596f0b
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Mon Dec 14 15:43:50
2015 +0000
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Thu Dec 10 15:10:00
2015 +0530
@@ -1054,17 +1054,6 @@
<!--802115--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--802115--></AD_TEXTINTERFACES>
-<!--802158--><AD_TEXTINTERFACES>
-<!--802158--> <AD_TEXTINTERFACES_ID><![CDATA[802158]]></AD_TEXTINTERFACES_ID>
-<!--802158--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--802158--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--802158--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--802158--> <TEXT><![CDATA[Show accounting tabs]]></TEXT>
-<!--802158-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ShowSessionPreferences.html]]></FILENAME>
-<!--802158--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--802158--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--802158--></AD_TEXTINTERFACES>
-
<!--802159--><AD_TEXTINTERFACES>
<!--802159--> <AD_TEXTINTERFACES_ID><![CDATA[802159]]></AD_TEXTINTERFACES_ID>
<!--802159--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19446,6 +19435,17 @@
<!--92E84ED4466A44F8844C59B72C2E191B-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--92E84ED4466A44F8844C59B72C2E191B--></AD_TEXTINTERFACES>
+<!--92F425349D7E43A6987FBF2372CAA898--><AD_TEXTINTERFACES>
+<!--92F425349D7E43A6987FBF2372CAA898-->
<AD_TEXTINTERFACES_ID><![CDATA[92F425349D7E43A6987FBF2372CAA898]]></AD_TEXTINTERFACES_ID>
+<!--92F425349D7E43A6987FBF2372CAA898-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92F425349D7E43A6987FBF2372CAA898--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92F425349D7E43A6987FBF2372CAA898--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92F425349D7E43A6987FBF2372CAA898--> <TEXT><![CDATA[Enable
Accounting]]></TEXT>
+<!--92F425349D7E43A6987FBF2372CAA898-->
<FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ShowSessionPreferences.html]]></FILENAME>
+<!--92F425349D7E43A6987FBF2372CAA898--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--92F425349D7E43A6987FBF2372CAA898-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--92F425349D7E43A6987FBF2372CAA898--></AD_TEXTINTERFACES>
+
<!--92F888AFA3FD4E8DBA0DAA44B6CC6A21--><AD_TEXTINTERFACES>
<!--92F888AFA3FD4E8DBA0DAA44B6CC6A21-->
<AD_TEXTINTERFACES_ID><![CDATA[92F888AFA3FD4E8DBA0DAA44B6CC6A21]]></AD_TEXTINTERFACES_ID>
<!--92F888AFA3FD4E8DBA0DAA44B6CC6A21-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 78b3579605cd -r 8942b6596f0b
src/org/openbravo/erpCommon/ad_forms/ShowSessionPreferences.html
--- a/src/org/openbravo/erpCommon/ad_forms/ShowSessionPreferences.html Mon Dec
14 15:43:50 2015 +0000
+++ b/src/org/openbravo/erpCommon/ad_forms/ShowSessionPreferences.html Thu Dec
10 15:10:00 2015 +0530
@@ -13,7 +13,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2011 Openbravo S.L.U.
+ * All portions are Copyright (C) 2001-2015 Openbravo S.L.U.
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -249,7 +249,7 @@
<tr>
- <td class="TitleCell"><span class="LabelText">Show
accounting tabs</span></td>
+ <td class="TitleCell"><span class="LabelText">Enable
Accounting</span></td>
<td class="Radio_Check_ContentCell"><span
class="Checkbox_container_NOT_Focused"><input type="checkbox"
name="inpAccounting" value="Y" id="paramAccounting"></input></span></td>
<td class="TitleCell"><span class="LabelText">Show
translation tabs</span></td>
<td class="Radio_Check_ContentCell"><span
class="Checkbox_container_NOT_Focused"><input type="checkbox"
name="inpTranslate" value="Y" id="paramTranslate"></input></span></td>
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
