0032315: [SERQA 616] 'Approval type' field into 'Cashup approval' tab is not seen translated

diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml +++ b/src-db/database/sourcedata/AD_COLUMN.xml @@ -2420,7 +2420,8 @@  <HELP><![CDATA[Type of approval. Different actions might require of differen approval types, for each type a set of supervisors can be assigned so they can grant it.]]></HELP>  <COLUMNNAME><![CDATA[Approval_Type]]></COLUMNNAME>  <AD_TABLE_ID><![CDATA[3E44B34E1EEA4B9CB10E2968CD022AB5]]></AD_TABLE_ID> - <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID> + <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID> + <AD_REFERENCE_VALUE_ID><![CDATA[6176112D123148AA8B8BDD5FFF007AED]]></AD_REFERENCE_VALUE_ID>  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>  <ISKEY><![CDATA[N]]></ISKEY>  <ISPARENT><![CDATA[N]]></ISPARENT> diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml +++ b/src-db/database/sourcedata/AD_MESSAGE.xml @@ -3567,18 +3567,6 @@  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> </AD_MESSAGE> -<AD_MESSAGE> - <AD_MESSAGE_ID><![CDATA[6F6BF25FBA484D8D9B81A122EA6A8537]]></AD_MESSAGE_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <VALUE><![CDATA[OBPOS_CashupCountDiff]]></VALUE> - <MSGTEXT><![CDATA[Cashup Count Differences]]></MSGTEXT> - <MSGTYPE><![CDATA[I]]></MSGTYPE> - <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> - <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> -</AD_MESSAGE> - <AD_MESSAGE>  <AD_MESSAGE_ID><![CDATA[6F7BBB4EF28D45E9995FE7378F2315BF]]></AD_MESSAGE_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src-db/database/sourcedata/AD_REFERENCE.xml b/src-db/database/sourcedata/AD_REFERENCE.xml --- a/src-db/database/sourcedata/AD_REFERENCE.xml +++ b/src-db/database/sourcedata/AD_REFERENCE.xml @@ -101,6 +101,18 @@  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED> </AD_REFERENCE> +<AD_REFERENCE> + <AD_REFERENCE_ID><![CDATA[6176112D123148AA8B8BDD5FFF007AED]]></AD_REFERENCE_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Cash up Approval type]]></NAME> + <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> + <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE> + <PARENTREFERENCE_ID><![CDATA[17]]></PARENTREFERENCE_ID> + <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED> +</AD_REFERENCE> + <AD_REFERENCE>  <AD_REFERENCE_ID><![CDATA[6E6A751F4AB24EC391AA9A6DD6B1F624]]></AD_REFERENCE_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src-db/database/sourcedata/AD_REF_LIST.xml b/src-db/database/sourcedata/AD_REF_LIST.xml --- a/src-db/database/sourcedata/AD_REF_LIST.xml +++ b/src-db/database/sourcedata/AD_REF_LIST.xml @@ -1314,6 +1314,17 @@  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> </AD_REF_LIST> +<AD_REF_LIST> + <AD_REF_LIST_ID><![CDATA[E1BC025C2FDB43239AB0700F8EC9AFBD]]></AD_REF_LIST_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <VALUE><![CDATA[OBPOS_CashupCountDiff]]></VALUE> + <NAME><![CDATA[Cashup Count Differences]]></NAME> + <AD_REFERENCE_ID><![CDATA[6176112D123148AA8B8BDD5FFF007AED]]></AD_REFERENCE_ID> + <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +</AD_REF_LIST> + <AD_REF_LIST>  <AD_REF_LIST_ID><![CDATA[E33AB5ACF6A540599AAF51709005434B]]></AD_REF_LIST_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src/org/openbravo/retail/posterminal/ProcessCashClose.java b/src/org/openbravo/retail/posterminal/ProcessCashClose.java --- a/src/org/openbravo/retail/posterminal/ProcessCashClose.java +++ b/src/org/openbravo/retail/posterminal/ProcessCashClose.java @@ -32,7 +32,6 @@ import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; import org.openbravo.dal.service.OBQuery; -import org.openbravo.erpCommon.utility.OBMessageUtils; import org.openbravo.mobile.core.process.DataSynchronizationImportProcess; import org.openbravo.mobile.core.process.DataSynchronizationProcess.DataSynchronization; import org.openbravo.mobile.core.process.JSONPropertyToEntity; @@ -47,9 +46,6 @@ public class ProcessCashClose extends POSDataSynchronizationProcess implements DataSynchronizationImportProcess { - public static final String CASHUP_COUNT_DIFF = OBMessageUtils.getI18NMessage( - "OBPOS_CashupCountDiff", null); - private static final Logger log = Logger.getLogger(ProcessCashClose.class); JSONObject jsonResponse = new JSONObject(); @@ -97,7 +93,7 @@ cashupApproval.setNewOBObject(true); cashupApproval.setCashUp(cashUp); cashupApproval.setActive(true); - cashupApproval.setApprovalType(CASHUP_COUNT_DIFF); + cashupApproval.setApprovalType("OBPOS_CashupCountDiff"); cashupApproval.setApprovalMessage(jsonApprovals.getString("message")); if (jsonApprovals.has("approvalReason")) { cashupApproval.setApprovalReason(OBDal.getInstance().get(OBPOSApprovalReason.class,

Issue History
Date Modified	Username	Field	Change
2016-02-23 12:38	asiermartirena	New Issue
2016-02-23 12:38	asiermartirena	Assigned To	=> Retail
2016-02-23 12:38	asiermartirena	File Added: cashCloseDiffApproval.diff
2016-02-23 12:38	asiermartirena	OBNetwork customer	=> No
2016-02-23 12:38	asiermartirena	Triggers an Emergency Pack	=> No
2016-02-23 12:39	asiermartirena	Tag Attached: SER-QA
2016-02-25 13:43	hgbot	Checkin
2016-02-25 13:43	hgbot	Note Added: 0084499
2016-02-25 13:43	hgbot	Status	new => resolved
2016-02-25 13:43	hgbot	Resolution	open => fixed
2016-02-25 13:43	hgbot	Fixed in SCM revision	=> http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/df469c6050082768d3f7ad0839bf2548029c327d [^]
2016-02-29 13:19	marvintm	Assigned To	Retail => asiermartirena
2016-03-11 15:51	marvintm	Review Assigned To	=> marvintm
2016-03-11 15:51	marvintm	Status	resolved => closed
2016-03-11 15:51	marvintm	Fixed in Version	=> RR16Q2

Notes
(0084499) hgbot (developer) 2016-02-25 13:43	Repository: erp/pmods/org.openbravo.retail.posterminal Changeset: df469c6050082768d3f7ad0839bf2548029c327d Author: Asier Martirena <asier.martirena <at> openbravo.com> Date: Thu Feb 25 13:43:23 2016 +0100 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/df469c6050082768d3f7ad0839bf2548029c327d [^] Fixed issue 32315: 'Approval type' field into 'Cashup approval' tab can be translated now --- M src-db/database/sourcedata/AD_COLUMN.xml M src-db/database/sourcedata/AD_MESSAGE.xml M src-db/database/sourcedata/AD_REFERENCE.xml M src-db/database/sourcedata/AD_REF_LIST.xml M src/org/openbravo/retail/posterminal/ProcessCashClose.java ---

Relationships [ Relation Graph ] [ Dependency Graph ]