Project:
| View Issue Details[ Jump to Notes ] | [ Issue History ] [ Print ] | |||||||
| ID | ||||||||
| 0027649 | ||||||||
| Type | Category | Severity | Reproducibility | Date Submitted | Last Update | |||
| feature request | [Retail Modules] Cash up | minor | have not tried | 2014-09-22 13:06 | 2015-02-19 09:10 | |||
| Reporter | naiaramartinez | View Status | public | |||||
| Assigned To | naiaramartinez | |||||||
| Priority | normal | Resolution | fixed | Fixed in Version | ||||
| Status | closed | Fix in branch | pi | Fixed in SCM revision | ||||
| Projection | none | ETA | none | Target Version | ||||
| OS | Any | Database | Any | Java version | ||||
| OS Version | Database version | Ant version | ||||||
| Product Version | SCM revision | |||||||
| Review Assigned To | marvintm | |||||||
| Regression level | ||||||||
| Regression date | ||||||||
| Regression introduced in release | ||||||||
| Regression introduced by commit | ||||||||
| Triggers an Emergency Pack | No | |||||||
| Summary | 0027649: Ability to configure cash up at terminal level (not only at terminal type level) | |||||||
| Description | Ability to configure cash up at terminal level (not only at terminal type level) | |||||||
| Steps To Reproduce | Add a field in 'terminal - payment type' that indicates if the configuration is going to override 'terminal type- payment method' configuration. If this field is checked, the configuration that will be taken into account will be the configuration defined at terminal level. | |||||||
| Proposed Solution | find attached file with the proposed solution | |||||||
| Tags | No tags attached. | |||||||
| Attached Files |  Documentation.odt [^] (57,166 bytes) 2014-11-07 12:37 27649_cashupConf.diff [^] (79,831 bytes) 2014-11-10 09:47 [Show Content] [Hide Content]diff --git a/src-db/database/model/tables/OBPOS_APP_PAYMENT.xml b/src-db/database/model/tables/OBPOS_APP_PAYMENT.xml
--- a/src-db/database/model/tables/OBPOS_APP_PAYMENT.xml
+++ b/src-db/database/model/tables/OBPOS_APP_PAYMENT.xml
@@ -61,6 +61,46 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="OVERRIDECONFIGURATION" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="C_GLITEM_DIFF_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="C_GLITEM_DROPDEP_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="AUTOMATEMOVEMENTTOOTHER" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="KEEPFIXEDAMOUNT" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="AMOUNT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="ALLOWVARIABLEAMOUNT" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="ALLOWDONTMOVE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="ALLOWMOVEEVERYTHING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
+ <column name="COUNTCASH" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+ <default/>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="OBPOS_APP_PAYMENT_TYPE" name="OBPOS_APP_PAYMENT_PAYTYPE">
<reference local="OBPOS_APP_PAYMENT_TYPE_ID" foreign="OBPOS_APP_PAYMENT_TYPE_ID"/>
</foreign-key>
@@ -76,6 +116,12 @@
<foreign-key foreignTable="OBPOS_APPLICATIONS" name="OBPOS_APPPAY_APPLICATIONS">
<reference local="OBPOS_APPLICATIONS_ID" foreign="OBPOS_APPLICATIONS_ID"/>
</foreign-key>
+ <foreign-key foreignTable="C_GLITEM" name="OBPOS_APPPAY_GLITEM_DIFFS">
+ <reference local="C_GLITEM_DIFF_ID" foreign="C_GLITEM_ID"/>
+ </foreign-key>
+ <foreign-key foreignTable="C_GLITEM" name="OBPOS_APPPAY_GLITEM_DROPDE">
+ <reference local="C_GLITEM_DROPDEP_ID" foreign="C_GLITEM_ID"/>
+ </foreign-key>
<foreign-key foreignTable="OBRETCO_CMEVENTS" name="OBPOS_CMEVENTS_FK">
<reference local="OBRETCO_CMEVENTS_ID" foreign="OBRETCO_CMEVENTS_ID"/>
</foreign-key>
@@ -96,6 +142,15 @@
<unique-column name="OBPOS_APPLICATIONS_ID"/>
<unique-column name="VALUE"/>
</unique>
+ <check name="OBPOS_APPPAY_AUTO_CHK"><![CDATA[AUTOMATEMOVEMENTTOOTHER IN ('Y', 'N')]]></check>
+ <check name="OBPOS_APPPAY_CONFI_CHK"><![CDATA[(((OVERRIDECONFIGURATION = 'Y') AND (C_GLITEM_DIFF_ID IS NOT NULL)) AND (C_GLITEM_DROPDEP_ID IS NOT NULL)) OR (OVERRIDECONFIGURATION = 'N')]]></check>
+ <check name="OBPOS_APPPAY_COUNTCASH_CHK"><![CDATA[COUNTCASH IN ('Y', 'N')]]></check>
+ <check name="OBPOS_APPPAY_DONTMOVE_CHK"><![CDATA[ALLOWDONTMOVE IN ('Y', 'N')]]></check>
<check name="OBPOS_APPPAY_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+ <check name="OBPOS_APPPAY_MOVEEVRY_CHK"><![CDATA[ALLOWMOVEEVERYTHING IN ('Y', 'N')]]></check>
+ <check name="OBPOS_APPPAY_OVERRIDECONF_CH"><![CDATA[OVERRIDECONFIGURATION IN ('Y', 'N')]]></check>
+ <check name="OBPOS_APPPAY_PTYPE_CLOSEGL_CH"><![CDATA[(AUTOMATEMOVEMENTTOOTHER = 'N') OR (C_GLITEM_DROPDEP_ID IS NOT NULL)]]></check>
+ <check name="OBPOS_APPPAY_PTYPE_FIXEDAM_CH"><![CDATA[(KEEPFIXEDAMOUNT = 'N') OR (AMOUNT IS NOT NULL)]]></check>
+ <check name="OBPOS_APPPAY_VARAMT_CHK"><![CDATA[ALLOWVARIABLEAMOUNT IN ('Y', 'N')]]></check>
</table>
</database>
diff --git a/src-db/database/model/triggers/OBPOS_APP_PAY_UNIQUEGL.xml b/src-db/database/model/triggers/OBPOS_APP_PAY_UNIQUEGL.xml
new file mode 100644
--- /dev/null
+++ b/src-db/database/model/triggers/OBPOS_APP_PAY_UNIQUEGL.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+ <database name="TRIGGER OBPOS_APP_PAY_UNIQUEGL">
+ <trigger name="OBPOS_APP_PAY_UNIQUEGL" table="OBPOS_APP_PAYMENT" fires="before" insert="true" update="true" delete="false" foreach="row">
+ <body><![CDATA[
+
+
+
+
+
+ /*************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.1 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2014 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ ************************************************************************/
+
+BEGIN
+
+ IF AD_isTriggerEnabled()='N' THEN RETURN;
+ END IF;
+
+ IF (INSERTING OR UPDATING) THEN
+ IF (:NEW.c_glitem_diff_id = :NEW.c_glitem_dropdep_id) THEN
+ RAISE_APPLICATION_ERROR(-20000, '@OBPOS_NON_UNIQUE_GLITEM_FOR_EVENT@');
+ END IF;
+ END IF;
+END OBPOS_APP_PAY_UNIQUEGL
+]]></body>
+ </trigger>
+ </database>
diff --git a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
new file mode 100644
--- /dev/null
+++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--441BE760031546648CE186AD44C8D75D--><AD_AUXILIARINPUT>
+<!--441BE760031546648CE186AD44C8D75D--> <AD_AUXILIARINPUT_ID><![CDATA[441BE760031546648CE186AD44C8D75D]]></AD_AUXILIARINPUT_ID>
+<!--441BE760031546648CE186AD44C8D75D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--441BE760031546648CE186AD44C8D75D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--441BE760031546648CE186AD44C8D75D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--441BE760031546648CE186AD44C8D75D--> <AD_TAB_ID><![CDATA[027E3BB9B7114CA68F976D0C0133E682]]></AD_TAB_ID>
+<!--441BE760031546648CE186AD44C8D75D--> <NAME><![CDATA[Iscash]]></NAME>
+<!--441BE760031546648CE186AD44C8D75D--> <CODE><![CDATA[@SQL=SELECT iscash FROM obpos_app_payment_type WHERE obpos_app_payment_type_id =@Obpos_App_Payment_Type_ID@]]></CODE>
+<!--441BE760031546648CE186AD44C8D75D--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--441BE760031546648CE186AD44C8D75D--></AD_AUXILIARINPUT>
+
+</data>
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
@@ -961,6 +961,41 @@
<!--127C5EA7D6D2457AB7889700C0A09BCC--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--127C5EA7D6D2457AB7889700C0A09BCC--></AD_COLUMN>
+<!--12ADBBA130EF49E1B12702AFDCD30470--><AD_COLUMN>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <AD_COLUMN_ID><![CDATA[12ADBBA130EF49E1B12702AFDCD30470]]></AD_COLUMN_ID>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <NAME><![CDATA[Allow Variable Amount]]></NAME>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <DESCRIPTION><![CDATA[Allow to keep a variable amount]]></DESCRIPTION>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <HELP><![CDATA[When checked, it will include in the cash up process the option to allow user to manually define the amount to be kept in current financial account.]]></HELP>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <COLUMNNAME><![CDATA[Allowvariableamount]]></COLUMNNAME>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <AD_TABLE_ID><![CDATA[CCE07BDBDC344FD98E52C293A987203F]]></AD_TABLE_ID>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <SEQNO><![CDATA[240]]></SEQNO>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <AD_ELEMENT_ID><![CDATA[9894CEF35FEE419C9A8D05C8D17303E9]]></AD_ELEMENT_ID>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <POSITION><![CDATA[22]]></POSITION>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--12ADBBA130EF49E1B12702AFDCD30470--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--12ADBBA130EF49E1B12702AFDCD30470--></AD_COLUMN>
+
<!--13E8F6A440FB4D4C9F6BFA2CA9CBB49E--><AD_COLUMN>
<!--13E8F6A440FB4D4C9F6BFA2CA9CBB49E--> <AD_COLUMN_ID><![CDATA[13E8F6A440FB4D4C9F6BFA2CA9CBB49E]]></AD_COLUMN_ID>
<!--13E8F6A440FB4D4C9F6BFA2CA9CBB49E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1104,6 +1139,42 @@
<!--198A411CD7CC4E408601F7E14919ACFC--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--198A411CD7CC4E408601F7E14919ACFC--></AD_COLUMN>
+<!--199B3A57A3674768B6A5BF8C57A3065E--><AD_COLUMN>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <AD_COLUMN_ID><![CDATA[199B3A57A3674768B6A5BF8C57A3065E]]></AD_COLUMN_ID>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <NAME><![CDATA[G/L Item for Cash Drop/Deposit]]></NAME>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <DESCRIPTION><![CDATA[G/L item for cash drop/deposit]]></DESCRIPTION>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <HELP><![CDATA[In case of automated funds movement in cash up process, two new transactions for this movement are created both in current and destination financial accounts. These transactions will use this G/L Item.]]></HELP>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <COLUMNNAME><![CDATA[C_Glitem_Dropdep_ID]]></COLUMNNAME>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <AD_TABLE_ID><![CDATA[CCE07BDBDC344FD98E52C293A987203F]]></AD_TABLE_ID>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <AD_REFERENCE_VALUE_ID><![CDATA[66E310A87A844A51B8BAD2884E996CD6]]></AD_REFERENCE_VALUE_ID>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <SEQNO><![CDATA[200]]></SEQNO>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <AD_ELEMENT_ID><![CDATA[2AAD5C20599C4F458554D4CD58A48E0D]]></AD_ELEMENT_ID>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <POSITION><![CDATA[18]]></POSITION>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--199B3A57A3674768B6A5BF8C57A3065E--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--199B3A57A3674768B6A5BF8C57A3065E--></AD_COLUMN>
+
<!--1A1828842C86406CA7BADCB67CEC8F38--><AD_COLUMN>
<!--1A1828842C86406CA7BADCB67CEC8F38--> <AD_COLUMN_ID><![CDATA[1A1828842C86406CA7BADCB67CEC8F38]]></AD_COLUMN_ID>
<!--1A1828842C86406CA7BADCB67CEC8F38--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1311,6 +1382,43 @@
<!--1FE1154C28BB4D65AD07147EED2DCDFE--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--1FE1154C28BB4D65AD07147EED2DCDFE--></AD_COLUMN>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--><AD_COLUMN>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <AD_COLUMN_ID><![CDATA[1FFA87C0D4CE4F3E9065AE61531319BF]]></AD_COLUMN_ID>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <NAME><![CDATA[Automate Movement to Other Account]]></NAME>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <DESCRIPTION><![CDATA[Automate Movement to Other Account]]></DESCRIPTION>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <HELP><![CDATA[When this field is flagged, Cash Up process will transfer founds from the financial account in this payment method to the one defined in the close event. In case it is not flagged, Cash Up process will create a reconciliation but will keep all the amount in current financial account.
+
+If checked, different options on how to do this movement can be defined by setting the rest of fields in this group.]]></HELP>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <COLUMNNAME><![CDATA[Automatemovementtoother]]></COLUMNNAME>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <AD_TABLE_ID><![CDATA[CCE07BDBDC344FD98E52C293A987203F]]></AD_TABLE_ID>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <SEQNO><![CDATA[210]]></SEQNO>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <AD_ELEMENT_ID><![CDATA[F17730174F0C4E81AA724CFE5A29720F]]></AD_ELEMENT_ID>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <POSITION><![CDATA[19]]></POSITION>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--1FFA87C0D4CE4F3E9065AE61531319BF--></AD_COLUMN>
+
<!--2286CFE5E2074432B7723288554677F6--><AD_COLUMN>
<!--2286CFE5E2074432B7723288554677F6--> <AD_COLUMN_ID><![CDATA[2286CFE5E2074432B7723288554677F6]]></AD_COLUMN_ID>
<!--2286CFE5E2074432B7723288554677F6--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1700,6 +1808,41 @@
<!--2B987017B3564388B57E7493409A4672--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--2B987017B3564388B57E7493409A4672--></AD_COLUMN>
+<!--2CB5E09000284770A39CEFF65493E46E--><AD_COLUMN>
+<!--2CB5E09000284770A39CEFF65493E46E--> <AD_COLUMN_ID><![CDATA[2CB5E09000284770A39CEFF65493E46E]]></AD_COLUMN_ID>
+<!--2CB5E09000284770A39CEFF65493E46E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2CB5E09000284770A39CEFF65493E46E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2CB5E09000284770A39CEFF65493E46E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2CB5E09000284770A39CEFF65493E46E--> <NAME><![CDATA[Allow Move Everything]]></NAME>
+<!--2CB5E09000284770A39CEFF65493E46E--> <DESCRIPTION><![CDATA[Allow Move Everything]]></DESCRIPTION>
+<!--2CB5E09000284770A39CEFF65493E46E--> <HELP><![CDATA[Includes an option in cash up process to move everything from current financial account, so cash up process would set it to 0.]]></HELP>
+<!--2CB5E09000284770A39CEFF65493E46E--> <COLUMNNAME><![CDATA[Allowmoveeverything]]></COLUMNNAME>
+<!--2CB5E09000284770A39CEFF65493E46E--> <AD_TABLE_ID><![CDATA[CCE07BDBDC344FD98E52C293A987203F]]></AD_TABLE_ID>
+<!--2CB5E09000284770A39CEFF65493E46E--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--2CB5E09000284770A39CEFF65493E46E--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--2CB5E09000284770A39CEFF65493E46E--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--2CB5E09000284770A39CEFF65493E46E--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--2CB5E09000284770A39CEFF65493E46E--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--2CB5E09000284770A39CEFF65493E46E--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--2CB5E09000284770A39CEFF65493E46E--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--2CB5E09000284770A39CEFF65493E46E--> <SEQNO><![CDATA[260]]></SEQNO>
+<!--2CB5E09000284770A39CEFF65493E46E--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--2CB5E09000284770A39CEFF65493E46E--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2CB5E09000284770A39CEFF65493E46E--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2CB5E09000284770A39CEFF65493E46E--> <AD_ELEMENT_ID><![CDATA[95EEFDC7A68540E1B1999C8105F97DB2]]></AD_ELEMENT_ID>
+<!--2CB5E09000284770A39CEFF65493E46E--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2CB5E09000284770A39CEFF65493E46E--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--2CB5E09000284770A39CEFF65493E46E--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2CB5E09000284770A39CEFF65493E46E--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2CB5E09000284770A39CEFF65493E46E--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--2CB5E09000284770A39CEFF65493E46E--> <POSITION><![CDATA[24]]></POSITION>
+<!--2CB5E09000284770A39CEFF65493E46E--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--2CB5E09000284770A39CEFF65493E46E--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--2CB5E09000284770A39CEFF65493E46E--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--2CB5E09000284770A39CEFF65493E46E--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--2CB5E09000284770A39CEFF65493E46E--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--2CB5E09000284770A39CEFF65493E46E--></AD_COLUMN>
+
<!--2DA63A8284294C7CAF36149E51CCEF19--><AD_COLUMN>
<!--2DA63A8284294C7CAF36149E51CCEF19--> <AD_COLUMN_ID><![CDATA[2DA63A8284294C7CAF36149E51CCEF19]]></AD_COLUMN_ID>
<!--2DA63A8284294C7CAF36149E51CCEF19--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2587,6 +2730,39 @@
<!--57CF66A9D10F48AF8DD4D07ABE392F44--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--57CF66A9D10F48AF8DD4D07ABE392F44--></AD_COLUMN>
+<!--58C56FE93A42483DA5903AF66F2EA78D--><AD_COLUMN>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <AD_COLUMN_ID><![CDATA[58C56FE93A42483DA5903AF66F2EA78D]]></AD_COLUMN_ID>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <NAME><![CDATA[Overrideconfiguration]]></NAME>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <COLUMNNAME><![CDATA[Overrideconfiguration]]></COLUMNNAME>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <AD_TABLE_ID><![CDATA[CCE07BDBDC344FD98E52C293A987203F]]></AD_TABLE_ID>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <SEQNO><![CDATA[180]]></SEQNO>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <AD_ELEMENT_ID><![CDATA[123497F723BC4698A148CE99240A8132]]></AD_ELEMENT_ID>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <POSITION><![CDATA[16]]></POSITION>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--58C56FE93A42483DA5903AF66F2EA78D--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--58C56FE93A42483DA5903AF66F2EA78D--></AD_COLUMN>
+
<!--5AE6D5F9328C42D780475EA994754A1B--><AD_COLUMN>
<!--5AE6D5F9328C42D780475EA994754A1B--> <AD_COLUMN_ID><![CDATA[5AE6D5F9328C42D780475EA994754A1B]]></AD_COLUMN_ID>
<!--5AE6D5F9328C42D780475EA994754A1B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2765,6 +2941,41 @@
<!--623238C0DCA34800BA7F3D0D0FE79F2A--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--623238C0DCA34800BA7F3D0D0FE79F2A--></AD_COLUMN>
+<!--63F5090A833845259CB25B7750B7AD07--><AD_COLUMN>
+<!--63F5090A833845259CB25B7750B7AD07--> <AD_COLUMN_ID><![CDATA[63F5090A833845259CB25B7750B7AD07]]></AD_COLUMN_ID>
+<!--63F5090A833845259CB25B7750B7AD07--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--63F5090A833845259CB25B7750B7AD07--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--63F5090A833845259CB25B7750B7AD07--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--63F5090A833845259CB25B7750B7AD07--> <NAME><![CDATA[Keep Fixed Amount]]></NAME>
+<!--63F5090A833845259CB25B7750B7AD07--> <DESCRIPTION><![CDATA[Keep Fixed Amount]]></DESCRIPTION>
+<!--63F5090A833845259CB25B7750B7AD07--> <HELP><![CDATA[Allows to keep a fixed amount in the current financial account.]]></HELP>
+<!--63F5090A833845259CB25B7750B7AD07--> <COLUMNNAME><![CDATA[Keepfixedamount]]></COLUMNNAME>
+<!--63F5090A833845259CB25B7750B7AD07--> <AD_TABLE_ID><![CDATA[CCE07BDBDC344FD98E52C293A987203F]]></AD_TABLE_ID>
+<!--63F5090A833845259CB25B7750B7AD07--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--63F5090A833845259CB25B7750B7AD07--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--63F5090A833845259CB25B7750B7AD07--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--63F5090A833845259CB25B7750B7AD07--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--63F5090A833845259CB25B7750B7AD07--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--63F5090A833845259CB25B7750B7AD07--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--63F5090A833845259CB25B7750B7AD07--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--63F5090A833845259CB25B7750B7AD07--> <SEQNO><![CDATA[220]]></SEQNO>
+<!--63F5090A833845259CB25B7750B7AD07--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--63F5090A833845259CB25B7750B7AD07--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--63F5090A833845259CB25B7750B7AD07--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--63F5090A833845259CB25B7750B7AD07--> <AD_ELEMENT_ID><![CDATA[F8BE69312A68424E90808A2DD987EE51]]></AD_ELEMENT_ID>
+<!--63F5090A833845259CB25B7750B7AD07--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--63F5090A833845259CB25B7750B7AD07--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--63F5090A833845259CB25B7750B7AD07--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--63F5090A833845259CB25B7750B7AD07--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--63F5090A833845259CB25B7750B7AD07--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--63F5090A833845259CB25B7750B7AD07--> <POSITION><![CDATA[20]]></POSITION>
+<!--63F5090A833845259CB25B7750B7AD07--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--63F5090A833845259CB25B7750B7AD07--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--63F5090A833845259CB25B7750B7AD07--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--63F5090A833845259CB25B7750B7AD07--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--63F5090A833845259CB25B7750B7AD07--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--63F5090A833845259CB25B7750B7AD07--></AD_COLUMN>
+
<!--650C5DE46681429ABCEC4C0A7E86F410--><AD_COLUMN>
<!--650C5DE46681429ABCEC4C0A7E86F410--> <AD_COLUMN_ID><![CDATA[650C5DE46681429ABCEC4C0A7E86F410]]></AD_COLUMN_ID>
<!--650C5DE46681429ABCEC4C0A7E86F410--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3192,6 +3403,42 @@
<!--6D68F7DFC208402D8B9AB2807EB44515--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--6D68F7DFC208402D8B9AB2807EB44515--></AD_COLUMN>
+<!--7049558C53FA467CA95B85002146375F--><AD_COLUMN>
+<!--7049558C53FA467CA95B85002146375F--> <AD_COLUMN_ID><![CDATA[7049558C53FA467CA95B85002146375F]]></AD_COLUMN_ID>
+<!--7049558C53FA467CA95B85002146375F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7049558C53FA467CA95B85002146375F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7049558C53FA467CA95B85002146375F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7049558C53FA467CA95B85002146375F--> <NAME><![CDATA[Cash Differences]]></NAME>
+<!--7049558C53FA467CA95B85002146375F--> <DESCRIPTION><![CDATA[G/L item for cash differences]]></DESCRIPTION>
+<!--7049558C53FA467CA95B85002146375F--> <HELP><![CDATA[This is the G/L Item used in Cash Up process in case there are differences between the expected and counted amount in this payment type. In this case a new transaction with this G/L Item and difference between expected and counted amounts will be created.]]></HELP>
+<!--7049558C53FA467CA95B85002146375F--> <COLUMNNAME><![CDATA[C_Glitem_Diff_ID]]></COLUMNNAME>
+<!--7049558C53FA467CA95B85002146375F--> <AD_TABLE_ID><![CDATA[CCE07BDBDC344FD98E52C293A987203F]]></AD_TABLE_ID>
+<!--7049558C53FA467CA95B85002146375F--> <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--7049558C53FA467CA95B85002146375F--> <AD_REFERENCE_VALUE_ID><![CDATA[66E310A87A844A51B8BAD2884E996CD6]]></AD_REFERENCE_VALUE_ID>
+<!--7049558C53FA467CA95B85002146375F--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7049558C53FA467CA95B85002146375F--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--7049558C53FA467CA95B85002146375F--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7049558C53FA467CA95B85002146375F--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7049558C53FA467CA95B85002146375F--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7049558C53FA467CA95B85002146375F--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7049558C53FA467CA95B85002146375F--> <SEQNO><![CDATA[190]]></SEQNO>
+<!--7049558C53FA467CA95B85002146375F--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7049558C53FA467CA95B85002146375F--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7049558C53FA467CA95B85002146375F--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7049558C53FA467CA95B85002146375F--> <AD_ELEMENT_ID><![CDATA[B04DB872B1D349309E77CDC5B533AC6A]]></AD_ELEMENT_ID>
+<!--7049558C53FA467CA95B85002146375F--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7049558C53FA467CA95B85002146375F--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7049558C53FA467CA95B85002146375F--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7049558C53FA467CA95B85002146375F--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7049558C53FA467CA95B85002146375F--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--7049558C53FA467CA95B85002146375F--> <POSITION><![CDATA[17]]></POSITION>
+<!--7049558C53FA467CA95B85002146375F--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7049558C53FA467CA95B85002146375F--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--7049558C53FA467CA95B85002146375F--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--7049558C53FA467CA95B85002146375F--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--7049558C53FA467CA95B85002146375F--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--7049558C53FA467CA95B85002146375F--></AD_COLUMN>
+
<!--725A3BFC24534F608B8B4E6597F39592--><AD_COLUMN>
<!--725A3BFC24534F608B8B4E6597F39592--> <AD_COLUMN_ID><![CDATA[725A3BFC24534F608B8B4E6597F39592]]></AD_COLUMN_ID>
<!--725A3BFC24534F608B8B4E6597F39592--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4228,6 +4475,39 @@
<!--980C02D15F96420C8F7B55F274F46DBE--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--980C02D15F96420C8F7B55F274F46DBE--></AD_COLUMN>
+<!--98F73997C24345C6BB45A3040647EB7B--><AD_COLUMN>
+<!--98F73997C24345C6BB45A3040647EB7B--> <AD_COLUMN_ID><![CDATA[98F73997C24345C6BB45A3040647EB7B]]></AD_COLUMN_ID>
+<!--98F73997C24345C6BB45A3040647EB7B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--98F73997C24345C6BB45A3040647EB7B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--98F73997C24345C6BB45A3040647EB7B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--98F73997C24345C6BB45A3040647EB7B--> <NAME><![CDATA[Amount]]></NAME>
+<!--98F73997C24345C6BB45A3040647EB7B--> <COLUMNNAME><![CDATA[Amount]]></COLUMNNAME>
+<!--98F73997C24345C6BB45A3040647EB7B--> <AD_TABLE_ID><![CDATA[CCE07BDBDC344FD98E52C293A987203F]]></AD_TABLE_ID>
+<!--98F73997C24345C6BB45A3040647EB7B--> <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--98F73997C24345C6BB45A3040647EB7B--> <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
+<!--98F73997C24345C6BB45A3040647EB7B--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--98F73997C24345C6BB45A3040647EB7B--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--98F73997C24345C6BB45A3040647EB7B--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--98F73997C24345C6BB45A3040647EB7B--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--98F73997C24345C6BB45A3040647EB7B--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--98F73997C24345C6BB45A3040647EB7B--> <SEQNO><![CDATA[230]]></SEQNO>
+<!--98F73997C24345C6BB45A3040647EB7B--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--98F73997C24345C6BB45A3040647EB7B--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--98F73997C24345C6BB45A3040647EB7B--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--98F73997C24345C6BB45A3040647EB7B--> <AD_ELEMENT_ID><![CDATA[7890366979712CEFE040007F01013334]]></AD_ELEMENT_ID>
+<!--98F73997C24345C6BB45A3040647EB7B--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--98F73997C24345C6BB45A3040647EB7B--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--98F73997C24345C6BB45A3040647EB7B--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--98F73997C24345C6BB45A3040647EB7B--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--98F73997C24345C6BB45A3040647EB7B--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--98F73997C24345C6BB45A3040647EB7B--> <POSITION><![CDATA[21]]></POSITION>
+<!--98F73997C24345C6BB45A3040647EB7B--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--98F73997C24345C6BB45A3040647EB7B--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--98F73997C24345C6BB45A3040647EB7B--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--98F73997C24345C6BB45A3040647EB7B--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--98F73997C24345C6BB45A3040647EB7B--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--98F73997C24345C6BB45A3040647EB7B--></AD_COLUMN>
+
<!--990F06CA36B7427BAB02782C5AA6C9EB--><AD_COLUMN>
<!--990F06CA36B7427BAB02782C5AA6C9EB--> <AD_COLUMN_ID><![CDATA[990F06CA36B7427BAB02782C5AA6C9EB]]></AD_COLUMN_ID>
<!--990F06CA36B7427BAB02782C5AA6C9EB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4474,6 +4754,41 @@
<!--9FF8662D33A04725B35D3A342CF12CFC--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--9FF8662D33A04725B35D3A342CF12CFC--></AD_COLUMN>
+<!--A0ADB8E6D46648619531A209AAB0E82F--><AD_COLUMN>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <AD_COLUMN_ID><![CDATA[A0ADB8E6D46648619531A209AAB0E82F]]></AD_COLUMN_ID>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <NAME><![CDATA[Allow Not to Move]]></NAME>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <DESCRIPTION><![CDATA[Allow not to move]]></DESCRIPTION>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <HELP><![CDATA[Allows user to decide to keep all counted amount in current financial account.]]></HELP>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <COLUMNNAME><![CDATA[Allowdontmove]]></COLUMNNAME>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <AD_TABLE_ID><![CDATA[CCE07BDBDC344FD98E52C293A987203F]]></AD_TABLE_ID>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <SEQNO><![CDATA[250]]></SEQNO>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <AD_ELEMENT_ID><![CDATA[50732E9493AF449C89CF0D22DEC93F3C]]></AD_ELEMENT_ID>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <POSITION><![CDATA[23]]></POSITION>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--A0ADB8E6D46648619531A209AAB0E82F--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--A0ADB8E6D46648619531A209AAB0E82F--></AD_COLUMN>
+
<!--A183669CEB5945EDAE2381D82A50D532--><AD_COLUMN>
<!--A183669CEB5945EDAE2381D82A50D532--> <AD_COLUMN_ID><![CDATA[A183669CEB5945EDAE2381D82A50D532]]></AD_COLUMN_ID>
<!--A183669CEB5945EDAE2381D82A50D532--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -7610,6 +7925,41 @@
<!--FE15A679ABEB4FE4B57CEE1863064856--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
<!--FE15A679ABEB4FE4B57CEE1863064856--></AD_COLUMN>
+<!--FE39F333F1964B01A129AB75BA64EF81--><AD_COLUMN>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <AD_COLUMN_ID><![CDATA[FE39F333F1964B01A129AB75BA64EF81]]></AD_COLUMN_ID>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <NAME><![CDATA[Count Cash]]></NAME>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <DESCRIPTION><![CDATA[A flag indicating whether to show or not a cash count step in the cash up process]]></DESCRIPTION>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <HELP><![CDATA[A payment type flag that indicates that a new step will showed in the cash up process to allow count the cash with the help of the currency denominations.]]></HELP>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <COLUMNNAME><![CDATA[Countcash]]></COLUMNNAME>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <AD_TABLE_ID><![CDATA[CCE07BDBDC344FD98E52C293A987203F]]></AD_TABLE_ID>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <SEQNO><![CDATA[270]]></SEQNO>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <AD_ELEMENT_ID><![CDATA[193208AFE3FB483DA34BEB49CCD45108]]></AD_ELEMENT_ID>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <POSITION><![CDATA[25]]></POSITION>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--FE39F333F1964B01A129AB75BA64EF81--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--FE39F333F1964B01A129AB75BA64EF81--></AD_COLUMN>
+
<!--FF6C68BF69724372B60BAECA092DB719--><AD_COLUMN>
<!--FF6C68BF69724372B60BAECA092DB719--> <AD_COLUMN_ID><![CDATA[FF6C68BF69724372B60BAECA092DB719]]></AD_COLUMN_ID>
<!--FF6C68BF69724372B60BAECA092DB719--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml
@@ -39,6 +39,18 @@
<!--0BD92938738E48A5B59C77B4EA12677C--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
<!--0BD92938738E48A5B59C77B4EA12677C--></AD_ELEMENT>
+<!--123497F723BC4698A148CE99240A8132--><AD_ELEMENT>
+<!--123497F723BC4698A148CE99240A8132--> <AD_ELEMENT_ID><![CDATA[123497F723BC4698A148CE99240A8132]]></AD_ELEMENT_ID>
+<!--123497F723BC4698A148CE99240A8132--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--123497F723BC4698A148CE99240A8132--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--123497F723BC4698A148CE99240A8132--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--123497F723BC4698A148CE99240A8132--> <COLUMNNAME><![CDATA[Overrideconfiguration]]></COLUMNNAME>
+<!--123497F723BC4698A148CE99240A8132--> <NAME><![CDATA[Override POS Terminal Type Configuration]]></NAME>
+<!--123497F723BC4698A148CE99240A8132--> <PRINTNAME><![CDATA[Override POS Terminal Type Configuration]]></PRINTNAME>
+<!--123497F723BC4698A148CE99240A8132--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--123497F723BC4698A148CE99240A8132--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--123497F723BC4698A148CE99240A8132--></AD_ELEMENT>
+
<!--155B975F19D54C63B76346997AA9D43D--><AD_ELEMENT>
<!--155B975F19D54C63B76346997AA9D43D--> <AD_ELEMENT_ID><![CDATA[155B975F19D54C63B76346997AA9D43D]]></AD_ELEMENT_ID>
<!--155B975F19D54C63B76346997AA9D43D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml
+++ b/src-db/database/sourcedata/AD_FIELD.xml
@@ -1,5 +1,34 @@
<?xml version='1.0' encoding='UTF-8'?>
<data>
+<!--001CC18AEF12453280AC802A401F4C60--><AD_FIELD>
+<!--001CC18AEF12453280AC802A401F4C60--> <AD_FIELD_ID><![CDATA[001CC18AEF12453280AC802A401F4C60]]></AD_FIELD_ID>
+<!--001CC18AEF12453280AC802A401F4C60--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--001CC18AEF12453280AC802A401F4C60--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--001CC18AEF12453280AC802A401F4C60--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--001CC18AEF12453280AC802A401F4C60--> <NAME><![CDATA[Allow Move Everything]]></NAME>
+<!--001CC18AEF12453280AC802A401F4C60--> <DESCRIPTION><![CDATA[Allow Move Everything]]></DESCRIPTION>
+<!--001CC18AEF12453280AC802A401F4C60--> <HELP><![CDATA[Includes an option in cash up process to move everything from current financial account, so cash up process would set it to 0.]]></HELP>
+<!--001CC18AEF12453280AC802A401F4C60--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--001CC18AEF12453280AC802A401F4C60--> <AD_TAB_ID><![CDATA[027E3BB9B7114CA68F976D0C0133E682]]></AD_TAB_ID>
+<!--001CC18AEF12453280AC802A401F4C60--> <AD_COLUMN_ID><![CDATA[2CB5E09000284770A39CEFF65493E46E]]></AD_COLUMN_ID>
+<!--001CC18AEF12453280AC802A401F4C60--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--001CC18AEF12453280AC802A401F4C60--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--001CC18AEF12453280AC802A401F4C60--> <DISPLAYLOGIC><![CDATA[@Automatemovementtoother@='Y' & @Overrideconfiguration@='Y']]></DISPLAYLOGIC>
+<!--001CC18AEF12453280AC802A401F4C60--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--001CC18AEF12453280AC802A401F4C60--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--001CC18AEF12453280AC802A401F4C60--> <SEQNO><![CDATA[190]]></SEQNO>
+<!--001CC18AEF12453280AC802A401F4C60--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--001CC18AEF12453280AC802A401F4C60--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--001CC18AEF12453280AC802A401F4C60--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--001CC18AEF12453280AC802A401F4C60--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--001CC18AEF12453280AC802A401F4C60--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--001CC18AEF12453280AC802A401F4C60--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--001CC18AEF12453280AC802A401F4C60--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--001CC18AEF12453280AC802A401F4C60--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--001CC18AEF12453280AC802A401F4C60--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--001CC18AEF12453280AC802A401F4C60--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--001CC18AEF12453280AC802A401F4C60--></AD_FIELD>
+
<!--005DC166ED6C48AF89E3280213F6F6F7--><AD_FIELD>
<!--005DC166ED6C48AF89E3280213F6F6F7--> <AD_FIELD_ID><![CDATA[005DC166ED6C48AF89E3280213F6F6F7]]></AD_FIELD_ID>
<!--005DC166ED6C48AF89E3280213F6F6F7--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -762,6 +791,32 @@
<!--2371E813B0804E02A9C3061C9B08FFF2--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--2371E813B0804E02A9C3061C9B08FFF2--></AD_FIELD>
+<!--27EA62EAF0BE4789A04870C86CE52332--><AD_FIELD>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <AD_FIELD_ID><![CDATA[27EA62EAF0BE4789A04870C86CE52332]]></AD_FIELD_ID>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <NAME><![CDATA[Override POS Terminal Type Configuration]]></NAME>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <AD_TAB_ID><![CDATA[027E3BB9B7114CA68F976D0C0133E682]]></AD_TAB_ID>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <AD_COLUMN_ID><![CDATA[58C56FE93A42483DA5903AF66F2EA78D]]></AD_COLUMN_ID>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <SEQNO><![CDATA[65]]></SEQNO>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--27EA62EAF0BE4789A04870C86CE52332--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--27EA62EAF0BE4789A04870C86CE52332--></AD_FIELD>
+
<!--29AC40AC973D400CB5200D8B8C14145D--><AD_FIELD>
<!--29AC40AC973D400CB5200D8B8C14145D--> <AD_FIELD_ID><![CDATA[29AC40AC973D400CB5200D8B8C14145D]]></AD_FIELD_ID>
<!--29AC40AC973D400CB5200D8B8C14145D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -791,6 +846,33 @@
<!--29AC40AC973D400CB5200D8B8C14145D--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--29AC40AC973D400CB5200D8B8C14145D--></AD_FIELD>
+<!--2A9035921BD14D0FBFA15D78F72621BD--><AD_FIELD>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <AD_FIELD_ID><![CDATA[2A9035921BD14D0FBFA15D78F72621BD]]></AD_FIELD_ID>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <NAME><![CDATA[Amount]]></NAME>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <AD_TAB_ID><![CDATA[027E3BB9B7114CA68F976D0C0133E682]]></AD_TAB_ID>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <AD_COLUMN_ID><![CDATA[98F73997C24345C6BB45A3040647EB7B]]></AD_COLUMN_ID>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <DISPLAYLOGIC><![CDATA[@Keepfixedamount@='Y' & @Automatemovementtoother@='Y' & @Overrideconfiguration@='Y']]></DISPLAYLOGIC>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <SEQNO><![CDATA[160]]></SEQNO>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--2A9035921BD14D0FBFA15D78F72621BD--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--2A9035921BD14D0FBFA15D78F72621BD--></AD_FIELD>
+
<!--2AE3F424DF984CEC8B3FFAEB9E468577--><AD_FIELD>
<!--2AE3F424DF984CEC8B3FFAEB9E468577--> <AD_FIELD_ID><![CDATA[2AE3F424DF984CEC8B3FFAEB9E468577]]></AD_FIELD_ID>
<!--2AE3F424DF984CEC8B3FFAEB9E468577--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -849,6 +931,35 @@
<!--2D7D8A37EAE049188DD3E1AF0E541B54--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--2D7D8A37EAE049188DD3E1AF0E541B54--></AD_FIELD>
+<!--2DFC922CF0014615AE83208145A7B048--><AD_FIELD>
+<!--2DFC922CF0014615AE83208145A7B048--> <AD_FIELD_ID><![CDATA[2DFC922CF0014615AE83208145A7B048]]></AD_FIELD_ID>
+<!--2DFC922CF0014615AE83208145A7B048--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2DFC922CF0014615AE83208145A7B048--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2DFC922CF0014615AE83208145A7B048--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2DFC922CF0014615AE83208145A7B048--> <NAME><![CDATA[Keep Fixed Amount]]></NAME>
+<!--2DFC922CF0014615AE83208145A7B048--> <DESCRIPTION><![CDATA[Keep Fixed Amount]]></DESCRIPTION>
+<!--2DFC922CF0014615AE83208145A7B048--> <HELP><![CDATA[Allows to keep a fixed amount in the current financial account.]]></HELP>
+<!--2DFC922CF0014615AE83208145A7B048--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--2DFC922CF0014615AE83208145A7B048--> <AD_TAB_ID><![CDATA[027E3BB9B7114CA68F976D0C0133E682]]></AD_TAB_ID>
+<!--2DFC922CF0014615AE83208145A7B048--> <AD_COLUMN_ID><![CDATA[63F5090A833845259CB25B7750B7AD07]]></AD_COLUMN_ID>
+<!--2DFC922CF0014615AE83208145A7B048--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--2DFC922CF0014615AE83208145A7B048--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--2DFC922CF0014615AE83208145A7B048--> <DISPLAYLOGIC><![CDATA[@Automatemovementtoother@='Y' & @Overrideconfiguration@='Y']]></DISPLAYLOGIC>
+<!--2DFC922CF0014615AE83208145A7B048--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--2DFC922CF0014615AE83208145A7B048--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--2DFC922CF0014615AE83208145A7B048--> <SEQNO><![CDATA[150]]></SEQNO>
+<!--2DFC922CF0014615AE83208145A7B048--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--2DFC922CF0014615AE83208145A7B048--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--2DFC922CF0014615AE83208145A7B048--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2DFC922CF0014615AE83208145A7B048--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--2DFC922CF0014615AE83208145A7B048--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--2DFC922CF0014615AE83208145A7B048--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--2DFC922CF0014615AE83208145A7B048--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--2DFC922CF0014615AE83208145A7B048--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--2DFC922CF0014615AE83208145A7B048--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--2DFC922CF0014615AE83208145A7B048--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--2DFC922CF0014615AE83208145A7B048--></AD_FIELD>
+
<!--2E1D867C4AE545099B758E503A49EC33--><AD_FIELD>
<!--2E1D867C4AE545099B758E503A49EC33--> <AD_FIELD_ID><![CDATA[2E1D867C4AE545099B758E503A49EC33]]></AD_FIELD_ID>
<!--2E1D867C4AE545099B758E503A49EC33--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1894,6 +2005,35 @@
<!--5A23AE2B8455417BB701637D231F361B--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--5A23AE2B8455417BB701637D231F361B--></AD_FIELD>
+<!--5B028B8B13CE467594812BB94CCC25D8--><AD_FIELD>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <AD_FIELD_ID><![CDATA[5B028B8B13CE467594812BB94CCC25D8]]></AD_FIELD_ID>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <NAME><![CDATA[G/L Item for Cash Drop/Deposit]]></NAME>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <DESCRIPTION><![CDATA[G/L item for cash drop/deposit]]></DESCRIPTION>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <HELP><![CDATA[In case of automated funds movement in cash up process, two new transactions for this movement are created both in current and destination financial accounts. These transactions will use this G/L Item.]]></HELP>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <AD_TAB_ID><![CDATA[027E3BB9B7114CA68F976D0C0133E682]]></AD_TAB_ID>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <AD_COLUMN_ID><![CDATA[199B3A57A3674768B6A5BF8C57A3065E]]></AD_COLUMN_ID>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <DISPLAYLOGIC><![CDATA[@Overrideconfiguration@='Y']]></DISPLAYLOGIC>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <SEQNO><![CDATA[130]]></SEQNO>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--5B028B8B13CE467594812BB94CCC25D8--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--5B028B8B13CE467594812BB94CCC25D8--></AD_FIELD>
+
<!--5C1AD6BD30FB4A699C69D22DFDD5FE6E--><AD_FIELD>
<!--5C1AD6BD30FB4A699C69D22DFDD5FE6E--> <AD_FIELD_ID><![CDATA[5C1AD6BD30FB4A699C69D22DFDD5FE6E]]></AD_FIELD_ID>
<!--5C1AD6BD30FB4A699C69D22DFDD5FE6E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2832,6 +2972,35 @@
<!--8DB2978691C74EA78A120890512036C6--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--8DB2978691C74EA78A120890512036C6--></AD_FIELD>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--><AD_FIELD>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <AD_FIELD_ID><![CDATA[8F4EA18ABE544DC69AA7B87CB0750C1B]]></AD_FIELD_ID>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <NAME><![CDATA[Allow Not to Move]]></NAME>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <DESCRIPTION><![CDATA[Allow not to move]]></DESCRIPTION>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <HELP><![CDATA[Allows user to decide to keep all counted amount in current financial account.]]></HELP>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <AD_TAB_ID><![CDATA[027E3BB9B7114CA68F976D0C0133E682]]></AD_TAB_ID>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <AD_COLUMN_ID><![CDATA[A0ADB8E6D46648619531A209AAB0E82F]]></AD_COLUMN_ID>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <DISPLAYLOGIC><![CDATA[@Automatemovementtoother@='Y' & @Overrideconfiguration@='Y']]></DISPLAYLOGIC>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <SEQNO><![CDATA[180]]></SEQNO>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--8F4EA18ABE544DC69AA7B87CB0750C1B--></AD_FIELD>
+
<!--91B450560BD5415CB8CE6A8909C21534--><AD_FIELD>
<!--91B450560BD5415CB8CE6A8909C21534--> <AD_FIELD_ID><![CDATA[91B450560BD5415CB8CE6A8909C21534]]></AD_FIELD_ID>
<!--91B450560BD5415CB8CE6A8909C21534--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3706,6 +3875,37 @@
<!--C5D811EF3D04440F8B0D27952360A7EF--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--C5D811EF3D04440F8B0D27952360A7EF--></AD_FIELD>
+<!--C7D1E9F6A0C543A0A57125F32183781F--><AD_FIELD>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <AD_FIELD_ID><![CDATA[C7D1E9F6A0C543A0A57125F32183781F]]></AD_FIELD_ID>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <NAME><![CDATA[Automate Movement to Other Account]]></NAME>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <DESCRIPTION><![CDATA[Automate Movement to Other Account]]></DESCRIPTION>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <HELP><![CDATA[When this field is flagged, Cash Up process will transfer founds from the financial account in this payment method to the one defined in the close event. In case it is not flagged, Cash Up process will create a reconciliation but will keep all the amount in current financial account.
+
+If checked, different options on how to do this movement can be defined by setting the rest of fields in this group.]]></HELP>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <AD_TAB_ID><![CDATA[027E3BB9B7114CA68F976D0C0133E682]]></AD_TAB_ID>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <AD_COLUMN_ID><![CDATA[1FFA87C0D4CE4F3E9065AE61531319BF]]></AD_COLUMN_ID>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <DISPLAYLOGIC><![CDATA[@Overrideconfiguration@='Y']]></DISPLAYLOGIC>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <SEQNO><![CDATA[140]]></SEQNO>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--C7D1E9F6A0C543A0A57125F32183781F--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--C7D1E9F6A0C543A0A57125F32183781F--></AD_FIELD>
+
<!--CD60AEC5C30D481593778F46633D67EA--><AD_FIELD>
<!--CD60AEC5C30D481593778F46633D67EA--> <AD_FIELD_ID><![CDATA[CD60AEC5C30D481593778F46633D67EA]]></AD_FIELD_ID>
<!--CD60AEC5C30D481593778F46633D67EA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3823,6 +4023,35 @@
<!--CF3109E18E5148CB81183EB989E420A3--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--CF3109E18E5148CB81183EB989E420A3--></AD_FIELD>
+<!--D41D04D1108A432CA501BA763B52081B--><AD_FIELD>
+<!--D41D04D1108A432CA501BA763B52081B--> <AD_FIELD_ID><![CDATA[D41D04D1108A432CA501BA763B52081B]]></AD_FIELD_ID>
+<!--D41D04D1108A432CA501BA763B52081B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D41D04D1108A432CA501BA763B52081B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D41D04D1108A432CA501BA763B52081B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D41D04D1108A432CA501BA763B52081B--> <NAME><![CDATA[Allow Variable Amount]]></NAME>
+<!--D41D04D1108A432CA501BA763B52081B--> <DESCRIPTION><![CDATA[Allow to keep a variable amount]]></DESCRIPTION>
+<!--D41D04D1108A432CA501BA763B52081B--> <HELP><![CDATA[When checked, it will include in the cash up process the option to allow user to manually define the amount to be kept in current financial account.]]></HELP>
+<!--D41D04D1108A432CA501BA763B52081B--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D41D04D1108A432CA501BA763B52081B--> <AD_TAB_ID><![CDATA[027E3BB9B7114CA68F976D0C0133E682]]></AD_TAB_ID>
+<!--D41D04D1108A432CA501BA763B52081B--> <AD_COLUMN_ID><![CDATA[12ADBBA130EF49E1B12702AFDCD30470]]></AD_COLUMN_ID>
+<!--D41D04D1108A432CA501BA763B52081B--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--D41D04D1108A432CA501BA763B52081B--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--D41D04D1108A432CA501BA763B52081B--> <DISPLAYLOGIC><![CDATA[@Automatemovementtoother@='Y' & @Overrideconfiguration@='Y']]></DISPLAYLOGIC>
+<!--D41D04D1108A432CA501BA763B52081B--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--D41D04D1108A432CA501BA763B52081B--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--D41D04D1108A432CA501BA763B52081B--> <SEQNO><![CDATA[170]]></SEQNO>
+<!--D41D04D1108A432CA501BA763B52081B--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--D41D04D1108A432CA501BA763B52081B--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--D41D04D1108A432CA501BA763B52081B--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D41D04D1108A432CA501BA763B52081B--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--D41D04D1108A432CA501BA763B52081B--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--D41D04D1108A432CA501BA763B52081B--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--D41D04D1108A432CA501BA763B52081B--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--D41D04D1108A432CA501BA763B52081B--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--D41D04D1108A432CA501BA763B52081B--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--D41D04D1108A432CA501BA763B52081B--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--D41D04D1108A432CA501BA763B52081B--></AD_FIELD>
+
<!--D60076C791F647BF971CAB0F62A42FA6--><AD_FIELD>
<!--D60076C791F647BF971CAB0F62A42FA6--> <AD_FIELD_ID><![CDATA[D60076C791F647BF971CAB0F62A42FA6]]></AD_FIELD_ID>
<!--D60076C791F647BF971CAB0F62A42FA6--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4137,6 +4366,36 @@
<!--DD3991D8CB4D4DAF8A4B797848A68F44--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--DD3991D8CB4D4DAF8A4B797848A68F44--></AD_FIELD>
+<!--DD8C2473CF42404AACDD70010BA69217--><AD_FIELD>
+<!--DD8C2473CF42404AACDD70010BA69217--> <AD_FIELD_ID><![CDATA[DD8C2473CF42404AACDD70010BA69217]]></AD_FIELD_ID>
+<!--DD8C2473CF42404AACDD70010BA69217--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DD8C2473CF42404AACDD70010BA69217--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DD8C2473CF42404AACDD70010BA69217--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DD8C2473CF42404AACDD70010BA69217--> <NAME><![CDATA[Cash Differences]]></NAME>
+<!--DD8C2473CF42404AACDD70010BA69217--> <DESCRIPTION><![CDATA[G/L item for cash differences]]></DESCRIPTION>
+<!--DD8C2473CF42404AACDD70010BA69217--> <HELP><![CDATA[This is the G/L Item used in Cash Up process in case there are differences between the expected and counted amount in this payment type. In this case a new transaction with this G/L Item and difference between expected and counted amounts will be created.]]></HELP>
+<!--DD8C2473CF42404AACDD70010BA69217--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--DD8C2473CF42404AACDD70010BA69217--> <AD_TAB_ID><![CDATA[027E3BB9B7114CA68F976D0C0133E682]]></AD_TAB_ID>
+<!--DD8C2473CF42404AACDD70010BA69217--> <AD_COLUMN_ID><![CDATA[7049558C53FA467CA95B85002146375F]]></AD_COLUMN_ID>
+<!--DD8C2473CF42404AACDD70010BA69217--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--DD8C2473CF42404AACDD70010BA69217--> <AD_FIELDGROUP_ID><![CDATA[F1A8FF12D50241979A7882FA69F7066B]]></AD_FIELDGROUP_ID>
+<!--DD8C2473CF42404AACDD70010BA69217--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--DD8C2473CF42404AACDD70010BA69217--> <DISPLAYLOGIC><![CDATA[@Overrideconfiguration@='Y']]></DISPLAYLOGIC>
+<!--DD8C2473CF42404AACDD70010BA69217--> <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--DD8C2473CF42404AACDD70010BA69217--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--DD8C2473CF42404AACDD70010BA69217--> <SEQNO><![CDATA[120]]></SEQNO>
+<!--DD8C2473CF42404AACDD70010BA69217--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--DD8C2473CF42404AACDD70010BA69217--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--DD8C2473CF42404AACDD70010BA69217--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--DD8C2473CF42404AACDD70010BA69217--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--DD8C2473CF42404AACDD70010BA69217--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--DD8C2473CF42404AACDD70010BA69217--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--DD8C2473CF42404AACDD70010BA69217--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--DD8C2473CF42404AACDD70010BA69217--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--DD8C2473CF42404AACDD70010BA69217--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--DD8C2473CF42404AACDD70010BA69217--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--DD8C2473CF42404AACDD70010BA69217--></AD_FIELD>
+
<!--DE8157CD86B44788B1A37197E54F36F6--><AD_FIELD>
<!--DE8157CD86B44788B1A37197E54F36F6--> <AD_FIELD_ID><![CDATA[DE8157CD86B44788B1A37197E54F36F6]]></AD_FIELD_ID>
<!--DE8157CD86B44788B1A37197E54F36F6--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4531,6 +4790,35 @@
<!--F0B7FCD1E9ADD6ACE040007F01004192--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--F0B7FCD1E9ADD6ACE040007F01004192--></AD_FIELD>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--><AD_FIELD>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <AD_FIELD_ID><![CDATA[F4F7C1B88ACC4CD691923C10343DE3CE]]></AD_FIELD_ID>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <NAME><![CDATA[Count Cash]]></NAME>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <DESCRIPTION><![CDATA[A flag indicating whether to show or not a cash count step in the cash up process]]></DESCRIPTION>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <HELP><![CDATA[A payment type flag that indicates that a new step will showed in the cash up process to allow count the cash with the help of the currency denominations.]]></HELP>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <AD_TAB_ID><![CDATA[027E3BB9B7114CA68F976D0C0133E682]]></AD_TAB_ID>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <AD_COLUMN_ID><![CDATA[FE39F333F1964B01A129AB75BA64EF81]]></AD_COLUMN_ID>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <DISPLAYLOGIC><![CDATA[@Iscash@='Y' & @Overrideconfiguration@='Y']]></DISPLAYLOGIC>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <SEQNO><![CDATA[200]]></SEQNO>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--F4F7C1B88ACC4CD691923C10343DE3CE--></AD_FIELD>
+
<!--F52A64F6ACE847079528A615B9C67B47--><AD_FIELD>
<!--F52A64F6ACE847079528A615B9C67B47--> <AD_FIELD_ID><![CDATA[F52A64F6ACE847079528A615B9C67B47]]></AD_FIELD_ID>
<!--F52A64F6ACE847079528A615B9C67B47--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src/org/openbravo/retail/posterminal/CashCloseProcessor.java b/src/org/openbravo/retail/posterminal/CashCloseProcessor.java
--- a/src/org/openbravo/retail/posterminal/CashCloseProcessor.java
+++ b/src/org/openbravo/retail/posterminal/CashCloseProcessor.java
@@ -236,7 +236,13 @@
FIN_Reconciliation reconciliation, OBPOSAppPayment payment, BigDecimal difference,
Date cashUpDate) {
FIN_FinancialAccount account = payment.getFinancialAccount();
- GLItem glItem = payment.getPaymentMethod().getCashDifferences();
+ GLItem glItem = null;
+ if (payment.isOverrideconfiguration()) {
+ glItem = payment.getCashDifferences();
+ } else {
+ glItem = payment.getPaymentMethod().getCashDifferences();
+ }
+
FIN_FinaccTransaction transaction = OBProvider.getInstance().get(FIN_FinaccTransaction.class);
transaction.setCurrency(account.getCurrency());
transaction.setAccount(account);
@@ -265,7 +271,13 @@
BigDecimal reconciliationTotal, Date cashUpDate) {
TerminalTypePaymentMethod paymentMethod = paymentType.getPaymentMethod();
FIN_FinancialAccount account = paymentType.getFinancialAccount();
- GLItem glItem = paymentMethod.getGlitemDropdep();
+ GLItem glItem = null;
+ if (paymentType.isOverrideconfiguration()) {
+ glItem = paymentType.getGLItemForCashDropDeposit();
+ } else {
+ glItem = paymentMethod.getGlitemDropdep();
+ }
+
FIN_FinaccTransaction transaction = OBProvider.getInstance().get(FIN_FinaccTransaction.class);
transaction.setCurrency(account.getCurrency());
transaction.setAccount(account);
@@ -289,7 +301,12 @@
protected FIN_FinaccTransaction createTotalTransferTransactionDeposit(OBPOSApplications terminal,
FIN_Reconciliation reconciliation, OBPOSAppPayment paymentType,
BigDecimal reconciliationTotal, Date cashUpDate) {
- GLItem glItem = paymentType.getPaymentMethod().getGlitemDropdep();
+ GLItem glItem = null;
+ if (paymentType.isOverrideconfiguration()) {
+ glItem = paymentType.getGLItemForCashDropDeposit();
+ } else {
+ glItem = paymentType.getPaymentMethod().getGlitemDropdep();
+ }
if (paymentType.getObretcoCmevents() == null) {
throw new OBException("There is no close event defined for the payment method");
}
diff --git a/src/org/openbravo/retail/posterminal/term/Payments.java b/src/org/openbravo/retail/posterminal/term/Payments.java
--- a/src/org/openbravo/retail/posterminal/term/Payments.java
+++ b/src/org/openbravo/retail/posterminal/term/Payments.java
@@ -59,10 +59,25 @@
for (Object objLine : paymentsquery.list()) {
Object[] objPayment = (Object[]) objLine;
JSONObject payment = new JSONObject();
- payment.put("payment",
- converter.toJsonObject((BaseOBObject) objPayment[0], DataResolvingMode.FULL));
- payment.put("paymentMethod",
- converter.toJsonObject((BaseOBObject) objPayment[1], DataResolvingMode.FULL));
+ JSONObject pay = converter.toJsonObject((BaseOBObject) objPayment[0],
+ DataResolvingMode.FULL);
+ JSONObject pMethod = converter.toJsonObject((BaseOBObject) objPayment[1],
+ DataResolvingMode.FULL);
+ if ("true".equals(pay.get("overrideconfiguration").toString())) {
+ pMethod.put("cashDifferences", pay.get("cashDifferences"));
+ pMethod.put("cashDifferences$_identifier", pay.get("cashDifferences$_identifier"));
+ pMethod.put("glitemDropdep", pay.get("gLItemForCashDropDeposit"));
+ pMethod.put("glitemDropdep$_identifier", pay.get("gLItemForCashDropDeposit$_identifier"));
+ pMethod.put("automatemovementtoother", pay.get("automateMovementToOtherAccount"));
+ pMethod.put("keepfixedamount", pay.get("keepFixedAmount"));
+ pMethod.put("amount", pay.get("amount"));
+ pMethod.put("allowvariableamount", pay.get("allowVariableAmount"));
+ pMethod.put("allowdontmove", pay.get("allowNotToMove"));
+ pMethod.put("allowmoveeverything", pay.get("allowMoveEverything"));
+ pMethod.put("countcash", pay.get("countCash"));
+ }
+ payment.put("payment", pay);
+ payment.put("paymentMethod", pMethod);
payment.put("rate", objPayment[2]);
BigDecimal mulrate = BigDecimal.ZERO;
@@ -89,5 +104,4 @@
OBContext.restorePreviousMode();
}
}
-
}
| |||||||
 Relationships [ Relation Graph ]
[ Dependency Graph ]
|
|
 Relationships |
|
Notes |
|
|
(0073633) guillermogil (manager) 2015-01-20 08:29 |
Here (http://wiki.openbravo.com/wiki/Retail:Configuration_Guide#POS_Terminal_window [^]) you can find the documentation |
|
(0073634) guillermogil (manager) 2015-01-20 08:57 |
Here is the changeset: https://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/0f6263003745 [^] |
|
(0073636) hgbot (developer) 2015-01-20 09:57 |
Repository: erp/pmods/org.openbravo.retail.posterminal Changeset: 70bb73a94a83dbdf2aebc49d879f437a03cbe504 Author: Guillermo Gil <guillermo.gil <at> openbravo.com> Date: Tue Jan 20 09:56:27 2015 +0100 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/70bb73a94a83dbdf2aebc49d879f437a03cbe504 [^] Related to issue 27649: Ability to configure cash up at terminal level Modified license audit --- M src-db/database/model/triggers/OBPOS_APP_PAY_UNIQUEGL.xml --- |
|
(0073645) hgbot (developer) 2015-01-20 14:21 |
Repository: erp/pmods/org.openbravo.retail.posterminal Changeset: 5212104f6271e7d71dbd2944b610f2dcd508b79c Author: Guillermo Gil <guillermo.gil <at> openbravo.com> Date: Tue Jan 20 14:21:16 2015 +0100 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/5212104f6271e7d71dbd2944b610f2dcd508b79c [^] Related to issue 27649: Ability to configure cash up at terminal level Fixed Retail test It was missing the default values for the boolean fields --- M src-db/database/model/tables/OBPOS_APP_PAYMENT.xml M src-db/database/sourcedata/AD_COLUMN.xml --- |
|
(0074549) hgbot (developer) 2015-02-17 12:48 |
Repository: erp/pmods/org.openbravo.retail.posterminal Changeset: f2d5aafc9562d16f14c10f80b8cd3256a4adcf6c Author: Guillermo Gil <guillermo.gil <at> openbravo.com> Date: Tue Feb 17 12:48:07 2015 +0100 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/f2d5aafc9562d16f14c10f80b8cd3256a4adcf6c [^] Related to issue 27649:configure cash up at terminal level Code review applied: the constraint OBPOS_APPPAY_PTYPE_CLOSEGL_CH in table OBPOS_APP_PAYMENT has been removed constraint Y/N to column keep_fixed_amount in table OBPOS_APP_PAYMENT has been created Replaced if condition on payments.java Added missing help/description --- M src-db/database/model/tables/OBPOS_APP_PAYMENT.xml M src-db/database/sourcedata/AD_COLUMN.xml M src-db/database/sourcedata/AD_ELEMENT.xml M src-db/database/sourcedata/AD_FIELD.xml M src/org/openbravo/retail/posterminal/term/Payments.java --- |
|
(0074637) malsasua (developer) 2015-02-19 09:10 |
verified |
|
Notes |
|
Issue History |
|||
| Date Modified | Username | Field | Change |
| 2014-09-22 13:06 | naiaramartinez | New Issue | |
| 2014-09-22 13:06 | naiaramartinez | Assigned To | => marvintm |
| 2014-09-22 13:06 | naiaramartinez | Triggers an Emergency Pack | => No |
| 2014-09-22 13:06 | naiaramartinez | Assigned To | marvintm => naiaramartinez |
| 2014-11-07 12:37 | naiaramartinez | File Added: Documentation.odt | |
| 2014-11-10 09:46 | naiaramartinez | Proposed Solution updated | |
| 2014-11-10 09:47 | naiaramartinez | File Added: 27649_cashupConf.diff | |
| 2015-01-20 08:21 | guillermogil | Issue Monitored: marvintm | |
| 2015-01-20 08:21 | guillermogil | Review Assigned To | => marvintm |
| 2015-01-20 08:29 | guillermogil | Note Added: 0073633 | |
| 2015-01-20 08:57 | guillermogil | Note Added: 0073634 | |
| 2015-01-20 08:58 | guillermogil | Status | new => scheduled |
| 2015-01-20 08:58 | guillermogil | fix_in_branch | => pi |
| 2015-01-20 08:58 | guillermogil | Status | scheduled => resolved |
| 2015-01-20 08:58 | guillermogil | Resolution | open => fixed |
| 2015-01-20 09:57 | hgbot | Checkin | |
| 2015-01-20 09:57 | hgbot | Note Added: 0073636 | |
| 2015-01-20 14:21 | hgbot | Checkin | |
| 2015-01-20 14:21 | hgbot | Note Added: 0073645 | |
| 2015-02-17 12:48 | hgbot | Checkin | |
| 2015-02-17 12:48 | hgbot | Note Added: 0074549 | |
| 2015-02-19 09:10 | malsasua | Note Added: 0074637 | |
| 2015-02-19 09:10 | malsasua | Status | resolved => closed |
|
Issue History |
| Copyright © 2000 - 2009 MantisBT Group |
 |