Project:
View Issue Details[ Jump to Notes ] | [ Issue History ] [ Print ] | |||||||
ID | ||||||||
0027534 | ||||||||
Type | Category | Severity | Reproducibility | Date Submitted | Last Update | |||
defect | [Retail Modules] Web POS | minor | have not tried | 2014-09-03 11:51 | 2015-05-04 14:34 | |||
Reporter | rafademiguel | View Status | public | |||||
Assigned To | ebecerra | |||||||
Priority | normal | Resolution | fixed | Fixed in Version | ||||
Status | closed | Fix in branch | pi | Fixed in SCM revision | be41fa54856e | |||
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 | migueldejuana | |||||||
Regression level | ||||||||
Regression date | ||||||||
Regression introduced in release | ||||||||
Regression introduced by commit | ||||||||
Triggers an Emergency Pack | No | |||||||
Summary | 0027534: PAYMENT METHOD HIERARCHY - Ability to group different payment methods in just one button | |||||||
Description | Currently when defining payment methods for a terminal there is no way of having two levels. First level that groups different payment methods and the second level that shows the real payment methods. For example. Credit Card -VISA -AMEX -Dinners Club Vouchers -Ticket Restaurant -Cheques Gourmet * Ability to group different payment methods in just one button | |||||||
Steps To Reproduce | Currently when defining payment methods for a terminal there is no way of having two levels. First level that groups different payment methods and the second level that shows the real payment methods. For example. Credit Card -VISA -AMEX -Dinners Club Vouchers -Ticket Restaurant -Cheques Gourmet * Ability to group different payment methods in just one button | |||||||
Tags | No tags attached. | |||||||
Attached Files | posTerminal-PaymentMethodHierarchy.diff [^] (108,607 bytes) 2015-02-11 15:31 [Show Content] [Hide Content]diff --git a/src-db/database/model/tables/OBPOS_APP_PAYMENT_TYPE.xml b/src-db/database/model/tables/OBPOS_APP_PAYMENT_TYPE.xml --- a/src-db/database/model/tables/OBPOS_APP_PAYMENT_TYPE.xml +++ b/src-db/database/model/tables/OBPOS_APP_PAYMENT_TYPE.xml @@ -149,12 +149,26 @@ <default><![CDATA[N]]></default> <onCreateDefault/> </column> + <column name="AD_IMAGE_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="OBPOS_PAY_METHOD_CATEGORY_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> <foreign-key foreignTable="AD_CLIENT" name="OBPOS_APPPAYTYPE_AD_CLIENT"> <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> </foreign-key> + <foreign-key foreignTable="AD_IMAGE" name="OBPOS_APPPAYTYPE_AD_IMAGE_ID"> + <reference local="AD_IMAGE_ID" foreign="AD_IMAGE_ID"/> + </foreign-key> <foreign-key foreignTable="AD_ORG" name="OBPOS_APPPAYTYPE_AD_ORG"> <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/> </foreign-key> + <foreign-key foreignTable="OBPOS_PAY_METHOD_CATEGORY" name="OBPOS_APPPAYTYPE_CATEGORY_ID"> + <reference local="OBPOS_PAY_METHOD_CATEGORY_ID" foreign="OBPOS_PAY_METHOD_CATEGORY_ID"/> + </foreign-key> <foreign-key foreignTable="C_CURRENCY" name="OBPOS_APPPAYTYPE_CURR"> <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/> </foreign-key> diff --git a/src-db/database/model/tables/OBPOS_PAY_METHOD_CATEGORY.xml b/src-db/database/model/tables/OBPOS_PAY_METHOD_CATEGORY.xml new file mode 100644 --- /dev/null +++ b/src-db/database/model/tables/OBPOS_PAY_METHOD_CATEGORY.xml @@ -0,0 +1,48 @@ +<?xml version="1.0"?> + <database name="TABLE OBPOS_PAY_METHOD_CATEGORY"> + <table name="OBPOS_PAY_METHOD_CATEGORY" primaryKey="OBPOS_PAYCATEGORY_KEY"> + <column name="OBPOS_PAY_METHOD_CATEGORY_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"> + <default><![CDATA[Y]]></default> + <onCreateDefault/> + </column> + <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"> + <default><![CDATA[SYSDATE]]></default> + <onCreateDefault/> + </column> + <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"> + <default><![CDATA[SYSDATE]]></default> + <onCreateDefault/> + </column> + <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <foreign-key foreignTable="AD_CLIENT" name="OBPOS_PAYCATEGORY_AD_CLIENT"> + <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/> + </foreign-key> + <foreign-key foreignTable="AD_ORG" name="OBPOS_PAYCATEGORY_AD_ORG"> + <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/> + </foreign-key> + <check name="OBPOS_PAYCATEGORY_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check> + </table> + </database> 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 @@ -1172,6 +1172,43 @@ <!--173E67CB4EFF49F9BCA9351280ED02D2--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--173E67CB4EFF49F9BCA9351280ED02D2--></AD_COLUMN> +<!--168C4F65A5E2454FBC49AD025E0AECB9--><AD_COLUMN> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <AD_COLUMN_ID><![CDATA[168C4F65A5E2454FBC49AD025E0AECB9]]></AD_COLUMN_ID> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <NAME><![CDATA[Image]]></NAME> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <DESCRIPTION><![CDATA[A visual picture used to describe an item.]]></DESCRIPTION> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <HELP><![CDATA[Defines a system image]]></HELP> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <COLUMNNAME><![CDATA[AD_Image_ID]]></COLUMNNAME> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <AD_TABLE_ID><![CDATA[B096FDF43917472D8FDE9693E9CCFFD4]]></AD_TABLE_ID> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <AD_REFERENCE_ID><![CDATA[4AA6C3BE9D3B4D84A3B80489505A23E5]]></AD_REFERENCE_ID> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <ISKEY><![CDATA[N]]></ISKEY> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <SEQNO><![CDATA[435]]></SEQNO> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <AD_ELEMENT_ID><![CDATA[1639]]></AD_ELEMENT_ID> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <POSITION><![CDATA[36]]></POSITION> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <IMAGESIZEVALUESACTION><![CDATA[RESIZE_NOASPECTRATIO]]></IMAGESIZEVALUESACTION> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <IMAGEWIDTH><![CDATA[102]]></IMAGEWIDTH> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <IMAGEHEIGHT><![CDATA[64]]></IMAGEHEIGHT> +<!--168C4F65A5E2454FBC49AD025E0AECB9--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--168C4F65A5E2454FBC49AD025E0AECB9--></AD_COLUMN> + <!--17BDDDDA3F7C4161A1BE252940DFF3C5--><AD_COLUMN> <!--17BDDDDA3F7C4161A1BE252940DFF3C5--> <AD_COLUMN_ID><![CDATA[17BDDDDA3F7C4161A1BE252940DFF3C5]]></AD_COLUMN_ID> <!--17BDDDDA3F7C4161A1BE252940DFF3C5--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1484,6 +1521,42 @@ <!--1FE1154C28BB4D65AD07147EED2DCDFE--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--1FE1154C28BB4D65AD07147EED2DCDFE--></AD_COLUMN> +<!--1FE23334E742466685B46042598395E4--><AD_COLUMN> +<!--1FE23334E742466685B46042598395E4--> <AD_COLUMN_ID><![CDATA[1FE23334E742466685B46042598395E4]]></AD_COLUMN_ID> +<!--1FE23334E742466685B46042598395E4--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--1FE23334E742466685B46042598395E4--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--1FE23334E742466685B46042598395E4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--1FE23334E742466685B46042598395E4--> <NAME><![CDATA[Creation Date]]></NAME> +<!--1FE23334E742466685B46042598395E4--> <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION> +<!--1FE23334E742466685B46042598395E4--> <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP> +<!--1FE23334E742466685B46042598395E4--> <COLUMNNAME><![CDATA[Created]]></COLUMNNAME> +<!--1FE23334E742466685B46042598395E4--> <AD_TABLE_ID><![CDATA[0173EA10159F4F759D936E010B9CF9FA]]></AD_TABLE_ID> +<!--1FE23334E742466685B46042598395E4--> <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID> +<!--1FE23334E742466685B46042598395E4--> <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH> +<!--1FE23334E742466685B46042598395E4--> <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE> +<!--1FE23334E742466685B46042598395E4--> <ISKEY><![CDATA[N]]></ISKEY> +<!--1FE23334E742466685B46042598395E4--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--1FE23334E742466685B46042598395E4--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> +<!--1FE23334E742466685B46042598395E4--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE> +<!--1FE23334E742466685B46042598395E4--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--1FE23334E742466685B46042598395E4--> <SEQNO><![CDATA[50]]></SEQNO> +<!--1FE23334E742466685B46042598395E4--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--1FE23334E742466685B46042598395E4--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--1FE23334E742466685B46042598395E4--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--1FE23334E742466685B46042598395E4--> <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID> +<!--1FE23334E742466685B46042598395E4--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--1FE23334E742466685B46042598395E4--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--1FE23334E742466685B46042598395E4--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--1FE23334E742466685B46042598395E4--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--1FE23334E742466685B46042598395E4--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--1FE23334E742466685B46042598395E4--> <POSITION><![CDATA[5]]></POSITION> +<!--1FE23334E742466685B46042598395E4--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--1FE23334E742466685B46042598395E4--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--1FE23334E742466685B46042598395E4--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--1FE23334E742466685B46042598395E4--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--1FE23334E742466685B46042598395E4--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--1FE23334E742466685B46042598395E4--></AD_COLUMN> + <!--2123B5BEE82A4452AA517C6AB1BAFD2E--><AD_COLUMN> <!--2123B5BEE82A4452AA517C6AB1BAFD2E--> <AD_COLUMN_ID><![CDATA[2123B5BEE82A4452AA517C6AB1BAFD2E]]></AD_COLUMN_ID> <!--2123B5BEE82A4452AA517C6AB1BAFD2E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -2646,6 +2719,41 @@ <!--46370E0A4715482287843215D944F310--> <EM_OBUIAPP_PROCESS_ID><![CDATA[8CA536FCF9334FEB9C1A469CFC270346]]></EM_OBUIAPP_PROCESS_ID> <!--46370E0A4715482287843215D944F310--></AD_COLUMN> +<!--47D0B7DC253C40A8B2D94D5243E5B996--><AD_COLUMN> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <AD_COLUMN_ID><![CDATA[47D0B7DC253C40A8B2D94D5243E5B996]]></AD_COLUMN_ID> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <NAME><![CDATA[Name]]></NAME> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <DESCRIPTION><![CDATA[Commercial Name of the Business Partner]]></DESCRIPTION> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <HELP><![CDATA[Commercial Name of the Business Partner]]></HELP> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <COLUMNNAME><![CDATA[Name]]></COLUMNNAME> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <AD_TABLE_ID><![CDATA[0173EA10159F4F759D936E010B9CF9FA]]></AD_TABLE_ID> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <ISKEY><![CDATA[N]]></ISKEY> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <SEQNO><![CDATA[90]]></SEQNO> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <AD_ELEMENT_ID><![CDATA[91534ABABD064DF8A702EE18DEE8F998]]></AD_ELEMENT_ID> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <POSITION><![CDATA[9]]></POSITION> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--47D0B7DC253C40A8B2D94D5243E5B996--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--47D0B7DC253C40A8B2D94D5243E5B996--></AD_COLUMN> + <!--4ABD5A10DC2644DC8BB809C1E940C478--><AD_COLUMN> <!--4ABD5A10DC2644DC8BB809C1E940C478--> <AD_COLUMN_ID><![CDATA[4ABD5A10DC2644DC8BB809C1E940C478]]></AD_COLUMN_ID> <!--4ABD5A10DC2644DC8BB809C1E940C478--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -2717,6 +2825,39 @@ <!--4BC604AD07194C3387732E7D727B1172--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--4BC604AD07194C3387732E7D727B1172--></AD_COLUMN> +<!--4C014BBE66F14DAD9D83675593B0839A--><AD_COLUMN> +<!--4C014BBE66F14DAD9D83675593B0839A--> <AD_COLUMN_ID><![CDATA[4C014BBE66F14DAD9D83675593B0839A]]></AD_COLUMN_ID> +<!--4C014BBE66F14DAD9D83675593B0839A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--4C014BBE66F14DAD9D83675593B0839A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--4C014BBE66F14DAD9D83675593B0839A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--4C014BBE66F14DAD9D83675593B0839A--> <NAME><![CDATA[Obpos_Pay_Method_Category_ID]]></NAME> +<!--4C014BBE66F14DAD9D83675593B0839A--> <COLUMNNAME><![CDATA[Obpos_Pay_Method_Category_ID]]></COLUMNNAME> +<!--4C014BBE66F14DAD9D83675593B0839A--> <AD_TABLE_ID><![CDATA[0173EA10159F4F759D936E010B9CF9FA]]></AD_TABLE_ID> +<!--4C014BBE66F14DAD9D83675593B0839A--> <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID> +<!--4C014BBE66F14DAD9D83675593B0839A--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> +<!--4C014BBE66F14DAD9D83675593B0839A--> <ISKEY><![CDATA[Y]]></ISKEY> +<!--4C014BBE66F14DAD9D83675593B0839A--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--4C014BBE66F14DAD9D83675593B0839A--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> +<!--4C014BBE66F14DAD9D83675593B0839A--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE> +<!--4C014BBE66F14DAD9D83675593B0839A--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--4C014BBE66F14DAD9D83675593B0839A--> <SEQNO><![CDATA[10]]></SEQNO> +<!--4C014BBE66F14DAD9D83675593B0839A--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--4C014BBE66F14DAD9D83675593B0839A--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--4C014BBE66F14DAD9D83675593B0839A--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--4C014BBE66F14DAD9D83675593B0839A--> <AD_ELEMENT_ID><![CDATA[C442992E0A204FC6AE50AFF15A751F3B]]></AD_ELEMENT_ID> +<!--4C014BBE66F14DAD9D83675593B0839A--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--4C014BBE66F14DAD9D83675593B0839A--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--4C014BBE66F14DAD9D83675593B0839A--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--4C014BBE66F14DAD9D83675593B0839A--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--4C014BBE66F14DAD9D83675593B0839A--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--4C014BBE66F14DAD9D83675593B0839A--> <POSITION><![CDATA[1]]></POSITION> +<!--4C014BBE66F14DAD9D83675593B0839A--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--4C014BBE66F14DAD9D83675593B0839A--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--4C014BBE66F14DAD9D83675593B0839A--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--4C014BBE66F14DAD9D83675593B0839A--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--4C014BBE66F14DAD9D83675593B0839A--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--4C014BBE66F14DAD9D83675593B0839A--></AD_COLUMN> + <!--4C31D9531AF848058BF9E66963BCD3F5--><AD_COLUMN> <!--4C31D9531AF848058BF9E66963BCD3F5--> <AD_COLUMN_ID><![CDATA[4C31D9531AF848058BF9E66963BCD3F5]]></AD_COLUMN_ID> <!--4C31D9531AF848058BF9E66963BCD3F5--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -2996,6 +3137,39 @@ <!--52F1742556DD4CC1BB8D93508E67A638--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--52F1742556DD4CC1BB8D93508E67A638--></AD_COLUMN> +<!--53B711DC0E4243AA8482EB131AC367DE--><AD_COLUMN> +<!--53B711DC0E4243AA8482EB131AC367DE--> <AD_COLUMN_ID><![CDATA[53B711DC0E4243AA8482EB131AC367DE]]></AD_COLUMN_ID> +<!--53B711DC0E4243AA8482EB131AC367DE--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--53B711DC0E4243AA8482EB131AC367DE--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--53B711DC0E4243AA8482EB131AC367DE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--53B711DC0E4243AA8482EB131AC367DE--> <NAME><![CDATA[Payment Method Category]]></NAME> +<!--53B711DC0E4243AA8482EB131AC367DE--> <COLUMNNAME><![CDATA[Obpos_Pay_Method_Category_ID]]></COLUMNNAME> +<!--53B711DC0E4243AA8482EB131AC367DE--> <AD_TABLE_ID><![CDATA[B096FDF43917472D8FDE9693E9CCFFD4]]></AD_TABLE_ID> +<!--53B711DC0E4243AA8482EB131AC367DE--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> +<!--53B711DC0E4243AA8482EB131AC367DE--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> +<!--53B711DC0E4243AA8482EB131AC367DE--> <ISKEY><![CDATA[N]]></ISKEY> +<!--53B711DC0E4243AA8482EB131AC367DE--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--53B711DC0E4243AA8482EB131AC367DE--> <ISMANDATORY><![CDATA[N]]></ISMANDATORY> +<!--53B711DC0E4243AA8482EB131AC367DE--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--53B711DC0E4243AA8482EB131AC367DE--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--53B711DC0E4243AA8482EB131AC367DE--> <SEQNO><![CDATA[445]]></SEQNO> +<!--53B711DC0E4243AA8482EB131AC367DE--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--53B711DC0E4243AA8482EB131AC367DE--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--53B711DC0E4243AA8482EB131AC367DE--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--53B711DC0E4243AA8482EB131AC367DE--> <AD_ELEMENT_ID><![CDATA[C442992E0A204FC6AE50AFF15A751F3B]]></AD_ELEMENT_ID> +<!--53B711DC0E4243AA8482EB131AC367DE--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--53B711DC0E4243AA8482EB131AC367DE--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--53B711DC0E4243AA8482EB131AC367DE--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--53B711DC0E4243AA8482EB131AC367DE--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--53B711DC0E4243AA8482EB131AC367DE--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--53B711DC0E4243AA8482EB131AC367DE--> <POSITION><![CDATA[37]]></POSITION> +<!--53B711DC0E4243AA8482EB131AC367DE--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--53B711DC0E4243AA8482EB131AC367DE--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--53B711DC0E4243AA8482EB131AC367DE--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--53B711DC0E4243AA8482EB131AC367DE--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--53B711DC0E4243AA8482EB131AC367DE--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--53B711DC0E4243AA8482EB131AC367DE--></AD_COLUMN> + <!--55EF78BC19674FF889FD553875EDE841--><AD_COLUMN> <!--55EF78BC19674FF889FD553875EDE841--> <AD_COLUMN_ID><![CDATA[55EF78BC19674FF889FD553875EDE841]]></AD_COLUMN_ID> <!--55EF78BC19674FF889FD553875EDE841--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -3170,6 +3344,41 @@ <!--5B84A7AB136F4C68AC2E969359114533--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--5B84A7AB136F4C68AC2E969359114533--></AD_COLUMN> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--><AD_COLUMN> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <AD_COLUMN_ID><![CDATA[5C4A2564C7CB417BA9C435CA0CDC574C]]></AD_COLUMN_ID> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <NAME><![CDATA[Created By]]></NAME> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <AD_TABLE_ID><![CDATA[0173EA10159F4F759D936E010B9CF9FA]]></AD_TABLE_ID> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <ISKEY><![CDATA[N]]></ISKEY> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <SEQNO><![CDATA[60]]></SEQNO> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <POSITION><![CDATA[6]]></POSITION> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--5C4A2564C7CB417BA9C435CA0CDC574C--></AD_COLUMN> + <!--5C6745D180FC48A3BCB8FF1D25E3C26B--><AD_COLUMN> <!--5C6745D180FC48A3BCB8FF1D25E3C26B--> <AD_COLUMN_ID><![CDATA[5C6745D180FC48A3BCB8FF1D25E3C26B]]></AD_COLUMN_ID> <!--5C6745D180FC48A3BCB8FF1D25E3C26B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -4629,6 +4838,41 @@ <!--8A3DC869E2B44812B74F17A14852CE56--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--8A3DC869E2B44812B74F17A14852CE56--></AD_COLUMN> +<!--8C738D12264747378697974B34B0C654--><AD_COLUMN> +<!--8C738D12264747378697974B34B0C654--> <AD_COLUMN_ID><![CDATA[8C738D12264747378697974B34B0C654]]></AD_COLUMN_ID> +<!--8C738D12264747378697974B34B0C654--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--8C738D12264747378697974B34B0C654--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--8C738D12264747378697974B34B0C654--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--8C738D12264747378697974B34B0C654--> <NAME><![CDATA[Updated By]]></NAME> +<!--8C738D12264747378697974B34B0C654--> <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION> +<!--8C738D12264747378697974B34B0C654--> <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP> +<!--8C738D12264747378697974B34B0C654--> <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME> +<!--8C738D12264747378697974B34B0C654--> <AD_TABLE_ID><![CDATA[0173EA10159F4F759D936E010B9CF9FA]]></AD_TABLE_ID> +<!--8C738D12264747378697974B34B0C654--> <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID> +<!--8C738D12264747378697974B34B0C654--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> +<!--8C738D12264747378697974B34B0C654--> <ISKEY><![CDATA[N]]></ISKEY> +<!--8C738D12264747378697974B34B0C654--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--8C738D12264747378697974B34B0C654--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> +<!--8C738D12264747378697974B34B0C654--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE> +<!--8C738D12264747378697974B34B0C654--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--8C738D12264747378697974B34B0C654--> <SEQNO><![CDATA[80]]></SEQNO> +<!--8C738D12264747378697974B34B0C654--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--8C738D12264747378697974B34B0C654--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--8C738D12264747378697974B34B0C654--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--8C738D12264747378697974B34B0C654--> <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID> +<!--8C738D12264747378697974B34B0C654--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--8C738D12264747378697974B34B0C654--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--8C738D12264747378697974B34B0C654--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--8C738D12264747378697974B34B0C654--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--8C738D12264747378697974B34B0C654--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--8C738D12264747378697974B34B0C654--> <POSITION><![CDATA[8]]></POSITION> +<!--8C738D12264747378697974B34B0C654--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--8C738D12264747378697974B34B0C654--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--8C738D12264747378697974B34B0C654--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--8C738D12264747378697974B34B0C654--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--8C738D12264747378697974B34B0C654--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--8C738D12264747378697974B34B0C654--></AD_COLUMN> + <!--8CB0F8789A9E4D3FA9CD4BD2200427EC--><AD_COLUMN> <!--8CB0F8789A9E4D3FA9CD4BD2200427EC--> <AD_COLUMN_ID><![CDATA[8CB0F8789A9E4D3FA9CD4BD2200427EC]]></AD_COLUMN_ID> <!--8CB0F8789A9E4D3FA9CD4BD2200427EC--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -5155,6 +5399,44 @@ <!--9915C628A3C04730A0A1CA99194594F8--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--9915C628A3C04730A0A1CA99194594F8--></AD_COLUMN> +<!--9A1AD91C32484206BD1A001DF64EFAAD--><AD_COLUMN> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <AD_COLUMN_ID><![CDATA[9A1AD91C32484206BD1A001DF64EFAAD]]></AD_COLUMN_ID> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <NAME><![CDATA[Active]]></NAME> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: +(1) The system requires the record for auditing purposes. +(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <AD_TABLE_ID><![CDATA[0173EA10159F4F759D936E010B9CF9FA]]></AD_TABLE_ID> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <ISKEY><![CDATA[N]]></ISKEY> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <SEQNO><![CDATA[40]]></SEQNO> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <POSITION><![CDATA[4]]></POSITION> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--9A1AD91C32484206BD1A001DF64EFAAD--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--9A1AD91C32484206BD1A001DF64EFAAD--></AD_COLUMN> + <!--9C91A87157764A39848978D1ABDAB38F--><AD_COLUMN> <!--9C91A87157764A39848978D1ABDAB38F--> <AD_COLUMN_ID><![CDATA[9C91A87157764A39848978D1ABDAB38F]]></AD_COLUMN_ID> <!--9C91A87157764A39848978D1ABDAB38F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -5616,6 +5898,42 @@ <!--A836870EE9434A09B8C91BF9D067EAC0--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--A836870EE9434A09B8C91BF9D067EAC0--></AD_COLUMN> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--><AD_COLUMN> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <AD_COLUMN_ID><![CDATA[A8F18CA779FD4E54A1C7D1C06024D44A]]></AD_COLUMN_ID> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <NAME><![CDATA[Client]]></NAME> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <AD_TABLE_ID><![CDATA[0173EA10159F4F759D936E010B9CF9FA]]></AD_TABLE_ID> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <ISKEY><![CDATA[N]]></ISKEY> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <SEQNO><![CDATA[20]]></SEQNO> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <POSITION><![CDATA[2]]></POSITION> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--A8F18CA779FD4E54A1C7D1C06024D44A--></AD_COLUMN> + <!--A99BDB078FE74BA19605A516694EBB6B--><AD_COLUMN> <!--A99BDB078FE74BA19605A516694EBB6B--> <AD_COLUMN_ID><![CDATA[A99BDB078FE74BA19605A516694EBB6B]]></AD_COLUMN_ID> <!--A99BDB078FE74BA19605A516694EBB6B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -7740,6 +8058,42 @@ <!--DE666A594C424473B97A29B9E4D0AB14--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--DE666A594C424473B97A29B9E4D0AB14--></AD_COLUMN> +<!--DF4D5140F8444B0CB52926ACA83CCD61--><AD_COLUMN> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <AD_COLUMN_ID><![CDATA[DF4D5140F8444B0CB52926ACA83CCD61]]></AD_COLUMN_ID> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <NAME><![CDATA[Updated]]></NAME> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <AD_TABLE_ID><![CDATA[0173EA10159F4F759D936E010B9CF9FA]]></AD_TABLE_ID> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <ISKEY><![CDATA[N]]></ISKEY> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <SEQNO><![CDATA[70]]></SEQNO> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <POSITION><![CDATA[7]]></POSITION> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--DF4D5140F8444B0CB52926ACA83CCD61--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--DF4D5140F8444B0CB52926ACA83CCD61--></AD_COLUMN> + <!--E023470D1352426586C8EE19D9CB5ED6--><AD_COLUMN> <!--E023470D1352426586C8EE19D9CB5ED6--> <AD_COLUMN_ID><![CDATA[E023470D1352426586C8EE19D9CB5ED6]]></AD_COLUMN_ID> <!--E023470D1352426586C8EE19D9CB5ED6--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -8203,6 +8557,42 @@ <!--ED5D0009467947649D747EE99EEE702F--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> <!--ED5D0009467947649D747EE99EEE702F--></AD_COLUMN> +<!--ED9D3A3816434D05BCD70C2521E440CC--><AD_COLUMN> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <AD_COLUMN_ID><![CDATA[ED9D3A3816434D05BCD70C2521E440CC]]></AD_COLUMN_ID> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <NAME><![CDATA[Organization]]></NAME> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <AD_TABLE_ID><![CDATA[0173EA10159F4F759D936E010B9CF9FA]]></AD_TABLE_ID> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <ISKEY><![CDATA[N]]></ISKEY> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <ISPARENT><![CDATA[N]]></ISPARENT> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <SEQNO><![CDATA[30]]></SEQNO> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <POSITION><![CDATA[3]]></POSITION> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> +<!--ED9D3A3816434D05BCD70C2521E440CC--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> +<!--ED9D3A3816434D05BCD70C2521E440CC--></AD_COLUMN> + <!--ED9F19120FCA46F09AAE40413A4B416D--><AD_COLUMN> <!--ED9F19120FCA46F09AAE40413A4B416D--> <AD_COLUMN_ID><![CDATA[ED9F19120FCA46F09AAE40413A4B416D]]></AD_COLUMN_ID> <!--ED9F19120FCA46F09AAE40413A4B416D--> <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 @@ -742,6 +742,18 @@ <!--79160EA002E24CE686C91226AEF1CBAF--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> <!--79160EA002E24CE686C91226AEF1CBAF--></AD_ELEMENT> +<!--7DE76BA4257C4236B5F0D7C530C92133--><AD_ELEMENT> +<!--7DE76BA4257C4236B5F0D7C530C92133--> <AD_ELEMENT_ID><![CDATA[7DE76BA4257C4236B5F0D7C530C92133]]></AD_ELEMENT_ID> +<!--7DE76BA4257C4236B5F0D7C530C92133--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--7DE76BA4257C4236B5F0D7C530C92133--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--7DE76BA4257C4236B5F0D7C530C92133--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--7DE76BA4257C4236B5F0D7C530C92133--> <COLUMNNAME><![CDATA[Obpos_Pay_Method_Category_ID]]></COLUMNNAME> +<!--7DE76BA4257C4236B5F0D7C530C92133--> <NAME><![CDATA[Payment method category]]></NAME> +<!--7DE76BA4257C4236B5F0D7C530C92133--> <PRINTNAME><![CDATA[Payment method category]]></PRINTNAME> +<!--7DE76BA4257C4236B5F0D7C530C92133--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--7DE76BA4257C4236B5F0D7C530C92133--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> +<!--7DE76BA4257C4236B5F0D7C530C92133--></AD_ELEMENT> + <!--8090A969525E46A9901E914BAD110255--><AD_ELEMENT> <!--8090A969525E46A9901E914BAD110255--> <AD_ELEMENT_ID><![CDATA[8090A969525E46A9901E914BAD110255]]></AD_ELEMENT_ID> <!--8090A969525E46A9901E914BAD110255--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1190,6 +1202,18 @@ <!--C368F632C733475CACA3898B2218CC40--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> <!--C368F632C733475CACA3898B2218CC40--></AD_ELEMENT> +<!--C442992E0A204FC6AE50AFF15A751F3B--><AD_ELEMENT> +<!--C442992E0A204FC6AE50AFF15A751F3B--> <AD_ELEMENT_ID><![CDATA[C442992E0A204FC6AE50AFF15A751F3B]]></AD_ELEMENT_ID> +<!--C442992E0A204FC6AE50AFF15A751F3B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--C442992E0A204FC6AE50AFF15A751F3B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--C442992E0A204FC6AE50AFF15A751F3B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--C442992E0A204FC6AE50AFF15A751F3B--> <COLUMNNAME><![CDATA[Obpos_Pay_Method_Category_ID]]></COLUMNNAME> +<!--C442992E0A204FC6AE50AFF15A751F3B--> <NAME><![CDATA[Obpos_Pay_Method_Category_ID]]></NAME> +<!--C442992E0A204FC6AE50AFF15A751F3B--> <PRINTNAME><![CDATA[Obpos_Pay_Method_Category_ID]]></PRINTNAME> +<!--C442992E0A204FC6AE50AFF15A751F3B--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--C442992E0A204FC6AE50AFF15A751F3B--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> +<!--C442992E0A204FC6AE50AFF15A751F3B--></AD_ELEMENT> + <!--C50877E219274043A015E0E2A7D61588--><AD_ELEMENT> <!--C50877E219274043A015E0E2A7D61588--> <AD_ELEMENT_ID><![CDATA[C50877E219274043A015E0E2A7D61588]]></AD_ELEMENT_ID> <!--C50877E219274043A015E0E2A7D61588--> <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 @@ -620,6 +620,34 @@ <!--17BAD2A143194BAA97D1B812270281D7--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--17BAD2A143194BAA97D1B812270281D7--></AD_FIELD> +<!--17CA67AE6EAB4A10BB097B76E64F375F--><AD_FIELD> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <AD_FIELD_ID><![CDATA[17CA67AE6EAB4A10BB097B76E64F375F]]></AD_FIELD_ID> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <NAME><![CDATA[Organization]]></NAME> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <AD_TAB_ID><![CDATA[1C508696073944B1BD81E42FC929AEFD]]></AD_TAB_ID> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <AD_COLUMN_ID><![CDATA[ED9D3A3816434D05BCD70C2521E440CC]]></AD_COLUMN_ID> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <SEQNO><![CDATA[10]]></SEQNO> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--17CA67AE6EAB4A10BB097B76E64F375F--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--17CA67AE6EAB4A10BB097B76E64F375F--></AD_FIELD> + <!--185F69ACF73B49CF81D936871ABB082F--><AD_FIELD> <!--185F69ACF73B49CF81D936871ABB082F--> <AD_FIELD_ID><![CDATA[185F69ACF73B49CF81D936871ABB082F]]></AD_FIELD_ID> <!--185F69ACF73B49CF81D936871ABB082F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -705,6 +733,36 @@ <!--194FCEF0230E4E7CBAADCBB05BB6DB5E--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--194FCEF0230E4E7CBAADCBB05BB6DB5E--></AD_FIELD> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--><AD_FIELD> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <AD_FIELD_ID><![CDATA[1CD7BB97E1E44AACB0A3488DD74634BA]]></AD_FIELD_ID> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <NAME><![CDATA[Active]]></NAME> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: +(1) The system requires the record for auditing purposes. +(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <AD_TAB_ID><![CDATA[1C508696073944B1BD81E42FC929AEFD]]></AD_TAB_ID> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <AD_COLUMN_ID><![CDATA[9A1AD91C32484206BD1A001DF64EFAAD]]></AD_COLUMN_ID> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <SEQNO><![CDATA[30]]></SEQNO> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--1CD7BB97E1E44AACB0A3488DD74634BA--></AD_FIELD> + <!--1E40739239984D7EB2775106B2756FB3--><AD_FIELD> <!--1E40739239984D7EB2775106B2756FB3--> <AD_FIELD_ID><![CDATA[1E40739239984D7EB2775106B2756FB3]]></AD_FIELD_ID> <!--1E40739239984D7EB2775106B2756FB3--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -787,6 +845,34 @@ <!--2032C68C1FAF43B2B6970EF0E3CCC362--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--2032C68C1FAF43B2B6970EF0E3CCC362--></AD_FIELD> +<!--21529DDA9E554F8BB3CCDD65416C0875--><AD_FIELD> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <AD_FIELD_ID><![CDATA[21529DDA9E554F8BB3CCDD65416C0875]]></AD_FIELD_ID> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <NAME><![CDATA[Name]]></NAME> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <DESCRIPTION><![CDATA[Commercial Name of the Business Partner]]></DESCRIPTION> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <HELP><![CDATA[Commercial Name of the Business Partner]]></HELP> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <AD_TAB_ID><![CDATA[1C508696073944B1BD81E42FC929AEFD]]></AD_TAB_ID> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <AD_COLUMN_ID><![CDATA[47D0B7DC253C40A8B2D94D5243E5B996]]></AD_COLUMN_ID> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <SEQNO><![CDATA[20]]></SEQNO> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--21529DDA9E554F8BB3CCDD65416C0875--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--21529DDA9E554F8BB3CCDD65416C0875--></AD_FIELD> + <!--220C630E74C348CEB46EBC094BA4BDD5--><AD_FIELD> <!--220C630E74C348CEB46EBC094BA4BDD5--> <AD_FIELD_ID><![CDATA[220C630E74C348CEB46EBC094BA4BDD5]]></AD_FIELD_ID> <!--220C630E74C348CEB46EBC094BA4BDD5--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1099,6 +1185,31 @@ <!--2F1CBD9681184476ACC820E3AAB19EF6--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--2F1CBD9681184476ACC820E3AAB19EF6--></AD_FIELD> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--><AD_FIELD> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <AD_FIELD_ID><![CDATA[2F6D4CF1743B4BE5A8C39C0CE55D453D]]></AD_FIELD_ID> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <NAME><![CDATA[Obpos_Pay_Method_Category_ID]]></NAME> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <AD_TAB_ID><![CDATA[1C508696073944B1BD81E42FC929AEFD]]></AD_TAB_ID> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <AD_COLUMN_ID><![CDATA[4C014BBE66F14DAD9D83675593B0839A]]></AD_COLUMN_ID> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--2F6D4CF1743B4BE5A8C39C0CE55D453D--></AD_FIELD> + <!--2F9EC9BBFD364E80945ED8DBE5DB46AD--><AD_FIELD> <!--2F9EC9BBFD364E80945ED8DBE5DB46AD--> <AD_FIELD_ID><![CDATA[2F9EC9BBFD364E80945ED8DBE5DB46AD]]></AD_FIELD_ID> <!--2F9EC9BBFD364E80945ED8DBE5DB46AD--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -1973,6 +2084,32 @@ <!--4F510ADB53B04719BF5854BF0C6B6CE7--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--4F510ADB53B04719BF5854BF0C6B6CE7--></AD_FIELD> +<!--50D834C66A324F2A89380D058E6F8542--><AD_FIELD> +<!--50D834C66A324F2A89380D058E6F8542--> <AD_FIELD_ID><![CDATA[50D834C66A324F2A89380D058E6F8542]]></AD_FIELD_ID> +<!--50D834C66A324F2A89380D058E6F8542--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--50D834C66A324F2A89380D058E6F8542--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--50D834C66A324F2A89380D058E6F8542--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--50D834C66A324F2A89380D058E6F8542--> <NAME><![CDATA[Payment Method Category]]></NAME> +<!--50D834C66A324F2A89380D058E6F8542--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--50D834C66A324F2A89380D058E6F8542--> <AD_TAB_ID><![CDATA[4D9F5E9CC0014A96861CEFB64BBF013B]]></AD_TAB_ID> +<!--50D834C66A324F2A89380D058E6F8542--> <AD_COLUMN_ID><![CDATA[53B711DC0E4243AA8482EB131AC367DE]]></AD_COLUMN_ID> +<!--50D834C66A324F2A89380D058E6F8542--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--50D834C66A324F2A89380D058E6F8542--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--50D834C66A324F2A89380D058E6F8542--> <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH> +<!--50D834C66A324F2A89380D058E6F8542--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--50D834C66A324F2A89380D058E6F8542--> <SEQNO><![CDATA[98]]></SEQNO> +<!--50D834C66A324F2A89380D058E6F8542--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--50D834C66A324F2A89380D058E6F8542--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--50D834C66A324F2A89380D058E6F8542--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--50D834C66A324F2A89380D058E6F8542--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--50D834C66A324F2A89380D058E6F8542--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--50D834C66A324F2A89380D058E6F8542--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--50D834C66A324F2A89380D058E6F8542--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--50D834C66A324F2A89380D058E6F8542--> <STARTNEWLINE><![CDATA[Y]]></STARTNEWLINE> +<!--50D834C66A324F2A89380D058E6F8542--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--50D834C66A324F2A89380D058E6F8542--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--50D834C66A324F2A89380D058E6F8542--></AD_FIELD> + <!--51790D82A05D42698ABBC8BCC3EB9F6E--><AD_FIELD> <!--51790D82A05D42698ABBC8BCC3EB9F6E--> <AD_FIELD_ID><![CDATA[51790D82A05D42698ABBC8BCC3EB9F6E]]></AD_FIELD_ID> <!--51790D82A05D42698ABBC8BCC3EB9F6E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -2227,6 +2364,34 @@ <!--5A23AE2B8455417BB701637D231F361B--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--5A23AE2B8455417BB701637D231F361B--></AD_FIELD> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--><AD_FIELD> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <AD_FIELD_ID><![CDATA[5A5B3D96384D4E8AB91E36D3E8B0DFB1]]></AD_FIELD_ID> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <NAME><![CDATA[Image]]></NAME> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <DESCRIPTION><![CDATA[A visual picture used to describe an item.]]></DESCRIPTION> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <HELP><![CDATA[Defines a system image]]></HELP> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <AD_TAB_ID><![CDATA[4D9F5E9CC0014A96861CEFB64BBF013B]]></AD_TAB_ID> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <AD_COLUMN_ID><![CDATA[168C4F65A5E2454FBC49AD025E0AECB9]]></AD_COLUMN_ID> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <SEQNO><![CDATA[99]]></SEQNO> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--5A5B3D96384D4E8AB91E36D3E8B0DFB1--></AD_FIELD> + <!--5C1AD6BD30FB4A699C69D22DFDD5FE6E--><AD_FIELD> <!--5C1AD6BD30FB4A699C69D22DFDD5FE6E--> <AD_FIELD_ID><![CDATA[5C1AD6BD30FB4A699C69D22DFDD5FE6E]]></AD_FIELD_ID> <!--5C1AD6BD30FB4A699C69D22DFDD5FE6E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -2856,6 +3021,33 @@ <!--7DA61099E943474BA8F68AE940693393--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> <!--7DA61099E943474BA8F68AE940693393--></AD_FIELD> +<!--7F4C8C38D1C147BB9039779AF875B222--><AD_FIELD> +<!--7F4C8C38D1C147BB9039779AF875B222--> <AD_FIELD_ID><![CDATA[7F4C8C38D1C147BB9039779AF875B222]]></AD_FIELD_ID> +<!--7F4C8C38D1C147BB9039779AF875B222--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--7F4C8C38D1C147BB9039779AF875B222--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--7F4C8C38D1C147BB9039779AF875B222--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--7F4C8C38D1C147BB9039779AF875B222--> <NAME><![CDATA[Client]]></NAME> +<!--7F4C8C38D1C147BB9039779AF875B222--> <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION> +<!--7F4C8C38D1C147BB9039779AF875B222--> <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP> +<!--7F4C8C38D1C147BB9039779AF875B222--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> +<!--7F4C8C38D1C147BB9039779AF875B222--> <AD_TAB_ID><![CDATA[1C508696073944B1BD81E42FC929AEFD]]></AD_TAB_ID> +<!--7F4C8C38D1C147BB9039779AF875B222--> <AD_COLUMN_ID><![CDATA[A8F18CA779FD4E54A1C7D1C06024D44A]]></AD_COLUMN_ID> +<!--7F4C8C38D1C147BB9039779AF875B222--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> +<!--7F4C8C38D1C147BB9039779AF875B222--> <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED> +<!--7F4C8C38D1C147BB9039779AF875B222--> <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH> +<!--7F4C8C38D1C147BB9039779AF875B222--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--7F4C8C38D1C147BB9039779AF875B222--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE> +<!--7F4C8C38D1C147BB9039779AF875B222--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> +<!--7F4C8C38D1C147BB9039779AF875B222--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> +<!--7F4C8C38D1C147BB9039779AF875B222--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> +<!--7F4C8C38D1C147BB9039779AF875B222--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> +<!--7F4C8C38D1C147BB9039779AF875B222--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--7F4C8C38D1C147BB9039779AF875B222--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> +<!--7F4C8C38D1C147BB9039779AF875B222--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> +<!--7F4C8C38D1C147BB9039779AF875B222--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> +<!--7F4C8C38D1C147BB9039779AF875B222--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +<!--7F4C8C38D1C147BB9039779AF875B222--></AD_FIELD> + <!--7FB96D60BC9E4135869DD5B65EAA551C--><AD_FIELD> <!--7FB96D60BC9E4135869DD5B65EAA551C--> <AD_FIELD_ID><![CDATA[7FB96D60BC9E4135869DD5B65EAA551C]]></AD_FIELD_ID> <!--7FB96D60BC9E4135869DD5B65EAA551C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src-db/database/sourcedata/AD_MENU.xml b/src-db/database/sourcedata/AD_MENU.xml --- a/src-db/database/sourcedata/AD_MENU.xml +++ b/src-db/database/sourcedata/AD_MENU.xml @@ -28,6 +28,19 @@ <!--42CEE92A82C8437CBDBCF5EDF2F416EF--> <OPENLINKINBROWSER><![CDATA[N]]></OPENLINKINBROWSER> <!--42CEE92A82C8437CBDBCF5EDF2F416EF--></AD_MENU> +<!--43C3800F26D64496A8FA114D37903B30--><AD_MENU> +<!--43C3800F26D64496A8FA114D37903B30--> <AD_MENU_ID><![CDATA[43C3800F26D64496A8FA114D37903B30]]></AD_MENU_ID> +<!--43C3800F26D64496A8FA114D37903B30--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--43C3800F26D64496A8FA114D37903B30--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--43C3800F26D64496A8FA114D37903B30--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--43C3800F26D64496A8FA114D37903B30--> <NAME><![CDATA[POS Payment Method Categories]]></NAME> +<!--43C3800F26D64496A8FA114D37903B30--> <DESCRIPTION><![CDATA[POS Payment Method Categories]]></DESCRIPTION> +<!--43C3800F26D64496A8FA114D37903B30--> <ISSUMMARY><![CDATA[N]]></ISSUMMARY> +<!--43C3800F26D64496A8FA114D37903B30--> <ACTION><![CDATA[W]]></ACTION> +<!--43C3800F26D64496A8FA114D37903B30--> <AD_WINDOW_ID><![CDATA[9E29B398CC2F49239D190C3B5C325E4E]]></AD_WINDOW_ID> +<!--43C3800F26D64496A8FA114D37903B30--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--43C3800F26D64496A8FA114D37903B30--></AD_MENU> + <!--896AC285FD8F4C25A869689D4A98DD8E--><AD_MENU> <!--896AC285FD8F4C25A869689D4A98DD8E--> <AD_MENU_ID><![CDATA[896AC285FD8F4C25A869689D4A98DD8E]]></AD_MENU_ID> <!--896AC285FD8F4C25A869689D4A98DD8E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> 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 @@ -2305,6 +2305,18 @@ <!--6C37D366874F441398E8EEB25725C176--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--6C37D366874F441398E8EEB25725C176--></AD_MESSAGE> +<!--6C985BB956174FBCBB02534462410A7B--><AD_MESSAGE> +<!--6C985BB956174FBCBB02534462410A7B--> <AD_MESSAGE_ID><![CDATA[6C985BB956174FBCBB02534462410A7B]]></AD_MESSAGE_ID> +<!--6C985BB956174FBCBB02534462410A7B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--6C985BB956174FBCBB02534462410A7B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--6C985BB956174FBCBB02534462410A7B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--6C985BB956174FBCBB02534462410A7B--> <VALUE><![CDATA[OBPOS_PaymentsNoItems]]></VALUE> +<!--6C985BB956174FBCBB02534462410A7B--> <MSGTEXT><![CDATA[No results]]></MSGTEXT> +<!--6C985BB956174FBCBB02534462410A7B--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--6C985BB956174FBCBB02534462410A7B--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--6C985BB956174FBCBB02534462410A7B--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--6C985BB956174FBCBB02534462410A7B--></AD_MESSAGE> + <!--6CC79C560BF24577BC250FBE5E03B8E3--><AD_MESSAGE> <!--6CC79C560BF24577BC250FBE5E03B8E3--> <AD_MESSAGE_ID><![CDATA[6CC79C560BF24577BC250FBE5E03B8E3]]></AD_MESSAGE_ID> <!--6CC79C560BF24577BC250FBE5E03B8E3--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -2557,6 +2569,18 @@ <!--78BEBCD00FBF4548BC48D8D426317198--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--78BEBCD00FBF4548BC48D8D426317198--></AD_MESSAGE> +<!--78F5EF42277840CCA3F2C06F369B77D6--><AD_MESSAGE> +<!--78F5EF42277840CCA3F2C06F369B77D6--> <AD_MESSAGE_ID><![CDATA[78F5EF42277840CCA3F2C06F369B77D6]]></AD_MESSAGE_ID> +<!--78F5EF42277840CCA3F2C06F369B77D6--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--78F5EF42277840CCA3F2C06F369B77D6--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--78F5EF42277840CCA3F2C06F369B77D6--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--78F5EF42277840CCA3F2C06F369B77D6--> <VALUE><![CDATA[OBPOS_PaymentsSelectedMethod]]></VALUE> +<!--78F5EF42277840CCA3F2C06F369B77D6--> <MSGTEXT><![CDATA[%0 has been selected as payment method]]></MSGTEXT> +<!--78F5EF42277840CCA3F2C06F369B77D6--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--78F5EF42277840CCA3F2C06F369B77D6--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--78F5EF42277840CCA3F2C06F369B77D6--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--78F5EF42277840CCA3F2C06F369B77D6--></AD_MESSAGE> + <!--79034AE8E220493284D1136EB7615825--><AD_MESSAGE> <!--79034AE8E220493284D1136EB7615825--> <AD_MESSAGE_ID><![CDATA[79034AE8E220493284D1136EB7615825]]></AD_MESSAGE_ID> <!--79034AE8E220493284D1136EB7615825--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -5583,6 +5607,18 @@ <!--F6372FCDDAC14C6493EA461B340F7698--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--F6372FCDDAC14C6493EA461B340F7698--></AD_MESSAGE> +<!--F683D18B615D4B73A9A3008910868707--><AD_MESSAGE> +<!--F683D18B615D4B73A9A3008910868707--> <AD_MESSAGE_ID><![CDATA[F683D18B615D4B73A9A3008910868707]]></AD_MESSAGE_ID> +<!--F683D18B615D4B73A9A3008910868707--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--F683D18B615D4B73A9A3008910868707--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--F683D18B615D4B73A9A3008910868707--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--F683D18B615D4B73A9A3008910868707--> <VALUE><![CDATA[OBPOS_PaymentsSelectCaption]]></VALUE> +<!--F683D18B615D4B73A9A3008910868707--> <MSGTEXT><![CDATA[Select a payment method ]]></MSGTEXT> +<!--F683D18B615D4B73A9A3008910868707--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--F683D18B615D4B73A9A3008910868707--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--F683D18B615D4B73A9A3008910868707--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--F683D18B615D4B73A9A3008910868707--></AD_MESSAGE> + <!--F6922569BC2D44C28B74157814476DA0--><AD_MESSAGE> <!--F6922569BC2D44C28B74157814476DA0--> <AD_MESSAGE_ID><![CDATA[F6922569BC2D44C28B74157814476DA0]]></AD_MESSAGE_ID> <!--F6922569BC2D44C28B74157814476DA0--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src-db/database/sourcedata/AD_TAB.xml b/src-db/database/sourcedata/AD_TAB.xml --- a/src-db/database/sourcedata/AD_TAB.xml +++ b/src-db/database/sourcedata/AD_TAB.xml @@ -29,6 +29,33 @@ <!--027E3BB9B7114CA68F976D0C0133E682--> <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT> <!--027E3BB9B7114CA68F976D0C0133E682--></AD_TAB> +<!--1C508696073944B1BD81E42FC929AEFD--><AD_TAB> +<!--1C508696073944B1BD81E42FC929AEFD--> <AD_TAB_ID><![CDATA[1C508696073944B1BD81E42FC929AEFD]]></AD_TAB_ID> +<!--1C508696073944B1BD81E42FC929AEFD--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--1C508696073944B1BD81E42FC929AEFD--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--1C508696073944B1BD81E42FC929AEFD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--1C508696073944B1BD81E42FC929AEFD--> <NAME><![CDATA[Payment Method Categories]]></NAME> +<!--1C508696073944B1BD81E42FC929AEFD--> <AD_TABLE_ID><![CDATA[0173EA10159F4F759D936E010B9CF9FA]]></AD_TABLE_ID> +<!--1C508696073944B1BD81E42FC929AEFD--> <AD_WINDOW_ID><![CDATA[9E29B398CC2F49239D190C3B5C325E4E]]></AD_WINDOW_ID> +<!--1C508696073944B1BD81E42FC929AEFD--> <SEQNO><![CDATA[10]]></SEQNO> +<!--1C508696073944B1BD81E42FC929AEFD--> <TABLEVEL><![CDATA[0]]></TABLEVEL> +<!--1C508696073944B1BD81E42FC929AEFD--> <ISSINGLEROW><![CDATA[N]]></ISSINGLEROW> +<!--1C508696073944B1BD81E42FC929AEFD--> <ISINFOTAB><![CDATA[N]]></ISINFOTAB> +<!--1C508696073944B1BD81E42FC929AEFD--> <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB> +<!--1C508696073944B1BD81E42FC929AEFD--> <ISREADONLY><![CDATA[N]]></ISREADONLY> +<!--1C508696073944B1BD81E42FC929AEFD--> <HASTREE><![CDATA[N]]></HASTREE> +<!--1C508696073944B1BD81E42FC929AEFD--> <PROCESSING><![CDATA[N]]></PROCESSING> +<!--1C508696073944B1BD81E42FC929AEFD--> <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS> +<!--1C508696073944B1BD81E42FC929AEFD--> <ISSORTTAB><![CDATA[N]]></ISSORTTAB> +<!--1C508696073944B1BD81E42FC929AEFD--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--1C508696073944B1BD81E42FC929AEFD--> <UIPATTERN><![CDATA[STD]]></UIPATTERN> +<!--1C508696073944B1BD81E42FC929AEFD--> <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS> +<!--1C508696073944B1BD81E42FC929AEFD--> <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY> +<!--1C508696073944B1BD81E42FC929AEFD--> <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD> +<!--1C508696073944B1BD81E42FC929AEFD--> <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE> +<!--1C508696073944B1BD81E42FC929AEFD--> <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT> +<!--1C508696073944B1BD81E42FC929AEFD--></AD_TAB> + <!--2628B44F02DF452A95BEDAF2050CC617--><AD_TAB> <!--2628B44F02DF452A95BEDAF2050CC617--> <AD_TAB_ID><![CDATA[2628B44F02DF452A95BEDAF2050CC617]]></AD_TAB_ID> <!--2628B44F02DF452A95BEDAF2050CC617--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src-db/database/sourcedata/AD_TABLE.xml b/src-db/database/sourcedata/AD_TABLE.xml --- a/src-db/database/sourcedata/AD_TABLE.xml +++ b/src-db/database/sourcedata/AD_TABLE.xml @@ -1,5 +1,28 @@ <?xml version='1.0' encoding='UTF-8'?> <data> +<!--0173EA10159F4F759D936E010B9CF9FA--><AD_TABLE> +<!--0173EA10159F4F759D936E010B9CF9FA--> <AD_TABLE_ID><![CDATA[0173EA10159F4F759D936E010B9CF9FA]]></AD_TABLE_ID> +<!--0173EA10159F4F759D936E010B9CF9FA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--0173EA10159F4F759D936E010B9CF9FA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--0173EA10159F4F759D936E010B9CF9FA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--0173EA10159F4F759D936E010B9CF9FA--> <NAME><![CDATA[OBPOS_Pay_Method_Category]]></NAME> +<!--0173EA10159F4F759D936E010B9CF9FA--> <TABLENAME><![CDATA[OBPOS_Pay_Method_Category]]></TABLENAME> +<!--0173EA10159F4F759D936E010B9CF9FA--> <CLASSNAME><![CDATA[PayMethodCategory]]></CLASSNAME> +<!--0173EA10159F4F759D936E010B9CF9FA--> <ISVIEW><![CDATA[N]]></ISVIEW> +<!--0173EA10159F4F759D936E010B9CF9FA--> <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL> +<!--0173EA10159F4F759D936E010B9CF9FA--> <AD_WINDOW_ID><![CDATA[9E29B398CC2F49239D190C3B5C325E4E]]></AD_WINDOW_ID> +<!--0173EA10159F4F759D936E010B9CF9FA--> <ISSECURITYENABLED><![CDATA[N]]></ISSECURITYENABLED> +<!--0173EA10159F4F759D936E010B9CF9FA--> <ISDELETEABLE><![CDATA[Y]]></ISDELETEABLE> +<!--0173EA10159F4F759D936E010B9CF9FA--> <ISHIGHVOLUME><![CDATA[N]]></ISHIGHVOLUME> +<!--0173EA10159F4F759D936E010B9CF9FA--> <IMPORTTABLE><![CDATA[N]]></IMPORTTABLE> +<!--0173EA10159F4F759D936E010B9CF9FA--> <ISCHANGELOG><![CDATA[N]]></ISCHANGELOG> +<!--0173EA10159F4F759D936E010B9CF9FA--> <ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT> +<!--0173EA10159F4F759D936E010B9CF9FA--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> +<!--0173EA10159F4F759D936E010B9CF9FA--> <AD_PACKAGE_ID><![CDATA[FF808181326CC34901326D58E1CA002A]]></AD_PACKAGE_ID> +<!--0173EA10159F4F759D936E010B9CF9FA--> <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE> +<!--0173EA10159F4F759D936E010B9CF9FA--> <ISTREE><![CDATA[N]]></ISTREE> +<!--0173EA10159F4F759D936E010B9CF9FA--></AD_TABLE> + <!--0469743705E3458299DF4293C1019E4F--><AD_TABLE> <!--0469743705E3458299DF4293C1019E4F--> <AD_TABLE_ID><![CDATA[0469743705E3458299DF4293C1019E4F]]></AD_TABLE_ID> <!--0469743705E3458299DF4293C1019E4F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src-db/database/sourcedata/AD_TREENODE.xml b/src-db/database/sourcedata/AD_TREENODE.xml --- a/src-db/database/sourcedata/AD_TREENODE.xml +++ b/src-db/database/sourcedata/AD_TREENODE.xml @@ -33,6 +33,17 @@ <!--55C9F58722AC4D2B8E6B8C17CAD0366C--> <SEQNO><![CDATA[100]]></SEQNO> <!--55C9F58722AC4D2B8E6B8C17CAD0366C--></AD_TREENODE> +<!--9A34D67A680744E4B00E07A5585020F1--><AD_TREENODE> +<!--9A34D67A680744E4B00E07A5585020F1--> <AD_TREENODE_ID><![CDATA[9A34D67A680744E4B00E07A5585020F1]]></AD_TREENODE_ID> +<!--9A34D67A680744E4B00E07A5585020F1--> <AD_TREE_ID><![CDATA[10]]></AD_TREE_ID> +<!--9A34D67A680744E4B00E07A5585020F1--> <NODE_ID><![CDATA[43C3800F26D64496A8FA114D37903B30]]></NODE_ID> +<!--9A34D67A680744E4B00E07A5585020F1--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--9A34D67A680744E4B00E07A5585020F1--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--9A34D67A680744E4B00E07A5585020F1--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--9A34D67A680744E4B00E07A5585020F1--> <PARENT_ID><![CDATA[896AC285FD8F4C25A869689D4A98DD8E]]></PARENT_ID> +<!--9A34D67A680744E4B00E07A5585020F1--> <SEQNO><![CDATA[70]]></SEQNO> +<!--9A34D67A680744E4B00E07A5585020F1--></AD_TREENODE> + <!--D9163EBFF1184AFE9A275A1A78AA80B3--><AD_TREENODE> <!--D9163EBFF1184AFE9A275A1A78AA80B3--> <AD_TREENODE_ID><![CDATA[D9163EBFF1184AFE9A275A1A78AA80B3]]></AD_TREENODE_ID> <!--D9163EBFF1184AFE9A275A1A78AA80B3--> <AD_TREE_ID><![CDATA[10]]></AD_TREE_ID> diff --git a/src-db/database/sourcedata/AD_WINDOW.xml b/src-db/database/sourcedata/AD_WINDOW.xml --- a/src-db/database/sourcedata/AD_WINDOW.xml +++ b/src-db/database/sourcedata/AD_WINDOW.xml @@ -34,6 +34,22 @@ <!--8AC4D0AC73A44547ACE1FC6A39D00F7F--> <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE> <!--8AC4D0AC73A44547ACE1FC6A39D00F7F--></AD_WINDOW> +<!--9E29B398CC2F49239D190C3B5C325E4E--><AD_WINDOW> +<!--9E29B398CC2F49239D190C3B5C325E4E--> <AD_WINDOW_ID><![CDATA[9E29B398CC2F49239D190C3B5C325E4E]]></AD_WINDOW_ID> +<!--9E29B398CC2F49239D190C3B5C325E4E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--9E29B398CC2F49239D190C3B5C325E4E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--9E29B398CC2F49239D190C3B5C325E4E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--9E29B398CC2F49239D190C3B5C325E4E--> <NAME><![CDATA[POS Payment Method Categories]]></NAME> +<!--9E29B398CC2F49239D190C3B5C325E4E--> <DESCRIPTION><![CDATA[POS Payment Method Categories]]></DESCRIPTION> +<!--9E29B398CC2F49239D190C3B5C325E4E--> <WINDOWTYPE><![CDATA[M]]></WINDOWTYPE> +<!--9E29B398CC2F49239D190C3B5C325E4E--> <ISSOTRX><![CDATA[Y]]></ISSOTRX> +<!--9E29B398CC2F49239D190C3B5C325E4E--> <PROCESSING><![CDATA[N]]></PROCESSING> +<!--9E29B398CC2F49239D190C3B5C325E4E--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> +<!--9E29B398CC2F49239D190C3B5C325E4E--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +<!--9E29B398CC2F49239D190C3B5C325E4E--> <ISTHREADSAFE><![CDATA[N]]></ISTHREADSAFE> +<!--9E29B398CC2F49239D190C3B5C325E4E--> <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE> +<!--9E29B398CC2F49239D190C3B5C325E4E--></AD_WINDOW> + <!--B2738FA83B494AD08AE1660859C014A6--><AD_WINDOW> <!--B2738FA83B494AD08AE1660859C014A6--> <AD_WINDOW_ID><![CDATA[B2738FA83B494AD08AE1660859C014A6]]></AD_WINDOW_ID> <!--B2738FA83B494AD08AE1660859C014A6--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java b/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java --- a/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java +++ b/src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java @@ -11,7 +11,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) 2013 Openbravo SLU + * All portions are Copyright (C) 2013-2015 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -198,6 +198,7 @@ "pointofsale/view/modals/modalstockinstore", "pointofsale/view/modals/modalstockinstoreclickable", "pointofsale/view/modals/modalstockinotherstore", + "pointofsale/view/modals/modalpayments", "pointofsale/view/modals/modalproductcannotbegroup", "pointofsale/view/modals/modalwarehousesrequired", "pointofsale/view/modals/modalcreditsales", 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 @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2012-2014 Openbravo S.L.U. + * Copyright (C) 2012-2015 Openbravo S.L.U. * Licensed under the Openbravo Commercial License version 1.0 * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html * or in the legal folder of this module distribution. @@ -12,6 +12,7 @@ import javax.servlet.ServletException; +import org.apache.commons.codec.binary.Base64; import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; @@ -43,8 +44,10 @@ + "p.financialAccount.currency.iSOCode as isocode, " + "p.financialAccount.currency.symbol as symbol, p.financialAccount.currency.currencySymbolAtTheRight as currencySymbolAtTheRight, " + "p.financialAccount.currentBalance as currentBalance, " - + "p.financialAccount.currency.obposPosprecision as obposPosprecision " - + "from OBPOS_App_Payment as p where p.obposApplications.id=? " + + "p.financialAccount.currency.obposPosprecision as obposPosprecision, " + + "img.bindaryData as image, img.mimetype as mimetype " + + "from OBPOS_App_Payment as p left outer join p.paymentMethod as pm " + + "left outer join pm.image as img where p.obposApplications.id=? " + "and p.$readableSimpleCriteria and p.$activeCriteria order by p.line, p.commercialName"; SimpleQueryBuilder querybuilder = new SimpleQueryBuilder(hqlPayments, OBContext @@ -78,6 +81,15 @@ payment.put("currencySymbolAtTheRight", objPayment[6]); payment.put("currentBalance", objPayment[7]); payment.put("obposPosprecision", objPayment[8]); + if (objPayment[9] != null && objPayment[10] != null) { + payment.put( + "image", + "data:" + objPayment[10] + ";base64," + + Base64.encodeBase64String((byte[]) objPayment[9])); + } else { + payment.put("image", objPayment[9]); + } + respArray.put(payment); } diff --git a/web/org.openbravo.retail.posterminal/css/obpos-main.css b/web/org.openbravo.retail.posterminal/css/obpos-main.css --- a/web/org.openbravo.retail.posterminal/css/obpos-main.css +++ b/web/org.openbravo.retail.posterminal/css/obpos-main.css @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2013 Openbravo S.L.U. + * Copyright (C) 2013-2014 Openbravo S.L.U. * Licensed under the Openbravo Commercial License version 1.0 * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html * or in the legal folder of this module distribution. @@ -14,4 +14,46 @@ .stockinstorelines:active { background-color: #cccccc; -} \ No newline at end of file +} + +.paymentmethoditems { + position: relative; + float: left; + width: 120px; + min-width: 25%; + color: #666666; + text-align: center; + cursor: pointer; +} + +@media all and (max-width: 800px) { + .paymentmethoditems { + min-width: 33%; + } +} + +.paymentmethoditemstext { + font-family: 'Helvetica Neue', 'Nimbus Sans L', Arial, sans-serif; + font-size: 16px; + height: 40px; + text-align: center; + padding: 2px 0px 0px 0px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; +} + +.paymentmethoditemsimage { + width: 102px; + margin: 0 auto; +} + +.paymentmethodnotitems { + width: 100%; + height: 80px; + padding-top: 30px; + color: #666666; + text-align: center; + font-size: 20px; + font-weight:bold; +} diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js --- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js +++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2013 Openbravo S.L.U. + * Copyright (C) 2013-2015 Openbravo S.L.U. * Licensed under the Openbravo Commercial License version 1.0 * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html * or in the legal folder of this module distribution. @@ -57,7 +57,8 @@ }, handlers: { onShowAllButtons: 'showAllButtons', - onCloseAllPopups: 'closeAllPopups' + onCloseAllPopups: 'closeAllPopups', + onButtonPaymentChanged: 'paymentChanged' }, components: [{ kind: 'OB.OBPOSPointOfSale.UI.PaymentMethods', @@ -161,22 +162,85 @@ } }; }, + addPaymentButton: function (btncomponent, countbuttons, paymentsbuttons, dialogbuttons, payment) { + if (btncomponent !== null) { + if (countbuttons < paymentsbuttons) { + this.createComponent(btncomponent); + } else { + OB.OBPOSPointOfSale.UI.PaymentMethods.prototype.sideButtons.push(btncomponent); + dialogbuttons[payment.payment.searchKey] = payment.payment._identifier; + } + } + }, initComponents: function () { //TODO: modal payments var i, max, payments, paymentsdialog, paymentsbuttons, countbuttons, btncomponent, Btn, inst, cont, exactdefault, cashdefault, allpayments = {}, me = this, + paymentCategories = [], dialogbuttons = {}; this.inherited(arguments); payments = OB.MobileApp.model.get('payments'); + // Count payment buttons checking payment method category + countbuttons = 0; + enyo.forEach(payments, function (payment) { + if (payment.paymentMethod.paymentMethodCategory) { + var paymentCategory = null; + paymentCategories.every(function (category) { + if (category.id === payment.paymentMethod.paymentMethodCategory) { + paymentCategory = category; + return false; + } + return true; + }); + if (paymentCategory === null) { + countbuttons++; + paymentCategories.push({ + id: payment.paymentMethod.paymentMethodCategory, + name: payment.paymentMethod.paymentMethodCategory$_identifier + }); + } + } else { + countbuttons++; + } + }); - paymentsdialog = payments.length + this.sideButtons.length > 5; + paymentsdialog = countbuttons + this.sideButtons.length > 5; paymentsbuttons = paymentsdialog ? 4 : 5; countbuttons = 0; + // Add buttons for payment method categories + enyo.forEach(paymentCategories, function (category) { + btncomponent = me.getButtonComponent({ + command: 'paymentMethodCategory.showitems.' + category.id, + label: category.name, + stateless: false, + action: function (keyboard, txt) { + if (me.currentPayment) { + var options = {}; + if (_.last(txt) === '%') { + options.percentaje = true; + } + var amount = OB.DEC.number(OB.I18N.parseNumber(txt)); + if (_.isNaN(amount)) { + OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_NotValidNumber', [txt])); + return; + } + me.pay(amount, me.currentPayment.payment.searchKey, me.currentPayment.payment._identifier, me.currentPayment.paymentMethod, me.currentPayment.rate, me.currentPayment.mulrate, me.currentPayment.isocode, options); + } + } + }); + me.addPaymentButton(btncomponent, countbuttons++, paymentsbuttons, dialogbuttons, { + payment: { + searchKey: 'paymentMethodCategory.showitems.' + category.id, + _identifier: category.name + } + }); + }); + enyo.forEach(payments, function (payment) { if (payment.paymentMethod.id === OB.MobileApp.model.get('terminal').terminalType.paymentMethod) { exactdefault = payment; @@ -186,30 +250,32 @@ } allpayments[payment.payment.searchKey] = payment; - btncomponent = this.getButtonComponent({ - command: payment.payment.searchKey, - label: payment.payment._identifier, - permission: payment.payment.searchKey, - stateless: false, - action: function (keyboard, txt) { - var options = {}; - if (_.last(txt) === '%') { - options.percentaje = true; + // Check for payment method category + if (payment.paymentMethod.paymentMethodCategory) { + btncomponent = null; + } else { + btncomponent = this.getButtonComponent({ + command: payment.payment.searchKey, + label: payment.payment._identifier + (payment.paymentMethod.paymentMethodCategory ? '*' : ''), + permission: payment.payment.searchKey, + stateless: false, + action: function (keyboard, txt) { + var options = {}; + if (_.last(txt) === '%') { + options.percentaje = true; + } + var amount = OB.DEC.number(OB.I18N.parseNumber(txt)); + if (_.isNaN(amount)) { + OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_NotValidNumber', [txt])); + return; + } + me.pay(amount, payment.payment.searchKey, payment.payment._identifier, payment.paymentMethod, payment.rate, payment.mulrate, payment.isocode, options); } - var amount = OB.DEC.number(OB.I18N.parseNumber(txt)); - if (_.isNaN(amount)) { - OB.UTIL.showWarning(OB.I18N.getLabel('OBPOS_NotValidNumber', [txt])); - return; - } - me.pay(amount, payment.payment.searchKey, payment.payment._identifier, payment.paymentMethod, payment.rate, payment.mulrate, payment.isocode, options); - } - }); + }); + } - if (countbuttons++ < paymentsbuttons) { - this.createComponent(btncomponent); - } else { - OB.OBPOSPointOfSale.UI.PaymentMethods.prototype.sideButtons.push(btncomponent); - dialogbuttons[payment.payment.searchKey] = payment.payment._identifier; + if (btncomponent !== null) { + me.addPaymentButton(btncomponent, countbuttons++, paymentsbuttons, dialogbuttons, payment); } }, this); @@ -249,12 +315,13 @@ this.owner.owner.addCommand('cashexact', { action: function (keyboard, txt) { - if (keyboard.status && !allpayments[keyboard.status]) { + var status = keyboard.status.indexOf('paymentMethodCategory.showitems.') === 0 && me.currentPayment ? me.currentPayment.payment.searchKey : keyboard.status; + if (status && !allpayments[status]) { // Is not a payment, so continue with the default path... - keyboard.execCommand(keyboard.status, null); + keyboard.execCommand(status, null); } else { // It is a payment... - var exactpayment = allpayments[keyboard.status] || exactdefault, + var exactpayment = allpayments[status] || exactdefault, amount = me.model.getPending(); if (exactpayment.rate && exactpayment.rate !== '1') { amount = OB.DEC.div(me.model.getPending(), exactpayment.rate); @@ -273,6 +340,10 @@ closeAllPopups: function () { this.$.OBPOS_UI_PaymentMethods.hide(); }, + paymentChanged: function (inSender, inEvent) { + this.currentPayment = inEvent.payment; + }, + shown: function () { var me = this, i, max, p, keyboard = this.owner.owner; diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/modals/modalpayments.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/modals/modalpayments.js new file mode 100644 --- /dev/null +++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/modals/modalpayments.js @@ -0,0 +1,142 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.0 (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) 2015 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************ + */ + +/*global enyo, Backbone, */ + +enyo.kind({ + kind: 'OB.UI.Modal', + topPosition: '75px', + name: 'OB.OBPOSPointOfSale.UI.Modals.modalPaymentsSelect', + events: { + onHideThisPopup: '' + }, + handlers: { + onSearchAction: 'searchAction' + }, + body: { + components: [{ + style: 'padding: 10px 10px 5px 10px;', + components: [{ + style: 'display: table; width: 100%;', + components: [{ + style: 'display: table-cell; width: 100%;', + components: [{ + kind: 'OB.UI.SearchInputAutoFilter', + name: 'paymentname', + style: 'width: 100%;' + }] + }, { + style: 'display: table-cell;', + components: [{ + kind: 'OB.UI.SmallButton', + classes: 'btnlink-gray btn-icon-small btn-icon-clear', + style: 'width: 80px; margin: 0px 5px 8px 19px;', + tap: function () { + this.owner.$.paymentname.setValue(''); + this.bubble('onSearchAction'); + } + }] + }, { + style: 'display: table-cell;', + components: [{ + kind: 'OB.UI.SmallButton', + classes: 'btnlink-yellow btn-icon-small btn-icon-search', + style: 'width: 80px; margin: 0px 0px 8px 5px;', + tap: function () { + this.bubble('onSearchAction'); + } + }] + }] + }, { + style: 'margin: 5px 0px 5px 0px; width: 100%; border-bottom: 1px solid #cccccc;' + }, { + name: 'paymentMethods', + kind: 'Scroller', + horizontal: 'hidden', + maxHeight: '330px', + setItems: function (items) { + var i = 0, + components = this.getComponents(); + while (i < components.length) { + if (components[i].name !== 'strategy') { + components[i++].destroy(); + } else { + i++; + } + } + items.forEach(function (item) { + this.createComponent({ + classes: 'paymentmethoditems', + tag: 'div', + allowHtml: true, + content: '<img class="paymentmethoditemsimage" src="' + item.image + '"/><div class="paymentmethoditemstext">' + item.name + '</div>', + payment: item.payment, + tap: function () { + var dialog = this.owner.owner.owner; + dialog.bubble('onStatusChanged', { + payment: this.payment, + status: this.payment.payment.searchKey + }); + dialog.bubble('onPaymentChanged', { + payment: this.payment, + status: this.payment.payment.searchKey + }); + dialog.doHideThisPopup(); + } + }); + }, this); + if (items.length === 0) { + this.createComponent({ + tag: 'div', + classes: 'paymentmethodnotitems', + content: OB.I18N.getLabel('OBPOS_PaymentsNoItems') + }); + } + this.render(); + } + }] + }] + }, + searchAction: function () { + var items = [], + payments = OB.POS.modelterminal.get('payments'), + filterBy = this.$.body.$.paymentname.getValue().toUpperCase(); + enyo.forEach(payments, function (payment) { + if (payment.paymentMethod.paymentMethodCategory && payment.paymentMethod.paymentMethodCategory === this.args.idCategory) { + if (filterBy === '' || payment.paymentMethod._identifier.toUpperCase().indexOf(filterBy) >= 0) { + items.push({ + name: payment.paymentMethod._identifier, + image: payment.image, + payment: payment + }); + } + } + }, this); + this.$.body.$.paymentMethods.setItems(items); + var me = this; + setTimeout(function () { + me.$.body.$.paymentMethods.render(); + }, 1); + }, + executeOnShow: function () { + this.setHeader(OB.I18N.getLabel('OBPOS_PaymentsSelectCaption')); + //this.$.body.$.paymentname.setValue(''); + this.searchAction(); + } +}); \ No newline at end of file diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js --- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js +++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2013-2014 Openbravo S.L.U. + * Copyright (C) 2013-2015 Openbravo S.L.U. * Licensed under the Openbravo Commercial License version 1.0 * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html * or in the legal folder of this module distribution. @@ -14,9 +14,13 @@ published: { receipt: null }, + events: { + onShowPopup: '' + }, handlers: { onButtonStatusChanged: 'buttonStatusChanged', - onMaxLimitAmountError: 'maxLimitAmountError' + onMaxLimitAmountError: 'maxLimitAmountError', + onButtonPaymentChanged: 'paymentChanged' }, getSelectedPayment: function () { if (this.receipt && this.receipt.selectedPayment) { @@ -25,42 +29,81 @@ return null; }, buttonStatusChanged: function (inSender, inEvent) { - var payment, amt, change, pending, isMultiOrders, paymentstatus; - payment = inEvent.value.payment || OB.MobileApp.model.paymentnames[OB.MobileApp.model.get('paymentcash')]; - if (_.isUndefined(payment)) { - return true; + this.$.paymentMethodSelect.setContent(''); + var maxHeight = 150; + // Resize scroll area to fix parent panel + var component = this.model.isValidMultiOrderState() ? this.$.multiPayments : this.$.payments; + if (component.$.tempty.getShowing()) { + maxHeight -= component.$.tempty.getBounds().height; } - // Clear limit amount error when click on PaymentMethod button - if (OB.POS.terminal.terminal.paymentnames[inEvent.value.status]) { - this.bubble('onMaxLimitAmountError', { - show: false, - maxLimitAmount: 0, - currency: '' + component.$.scrollArea.setStyle("height: " + maxHeight + "px"); + // Scroll to bottom + var height = 0; + component.$.tbody.children.forEach(function (line) { + height += line.getBounds().height; + }); + component.$.scrollArea.setScrollTop(height - maxHeight); + if (inEvent.value.status && inEvent.value.status.indexOf('paymentMethodCategory.showitems.') === 0) { + this.doShowPopup({ + popup: 'modalPaymentsSelect', + args: { + idCategory: inEvent.value.status.substring(inEvent.value.status.lastIndexOf('.') + 1) + } }); + } else { + var payment, amt, change, pending, isMultiOrders, paymentstatus; + payment = inEvent.value.payment || OB.MobileApp.model.paymentnames[OB.MobileApp.model.get('paymentcash')]; + if (_.isUndefined(payment)) { + return true; + } + // Clear limit amount error when click on PaymentMethod button + if (OB.POS.terminal.terminal.paymentnames[inEvent.value.status]) { + this.bubble('onMaxLimitAmountError', { + show: false, + maxLimitAmount: 0, + currency: '' + }); + } + isMultiOrders = this.model.isValidMultiOrderState(); + change = this.model.getChange(); + pending = this.model.getPending(); + if (!isMultiOrders) { + if (!_.isNull(this.receipt)) { + this.receipt.selectedPayment = payment.payment.searchKey; + paymentstatus = this.receipt.getPaymentStatus(); + } + } else { + this.model.get('multiOrders').set('selectedPayment', payment.payment.searchKey); + paymentstatus = this.model.get('multiOrders').getPaymentStatus(); + } + + if (!_.isNull(change) && change) { + this.$.change.setContent(OB.I18N.formatCurrencyWithSymbol(OB.DEC.mul(change, payment.mulrate), payment.symbol, payment.currencySymbolAtTheRight)); + OB.MobileApp.model.set('changeReceipt', OB.I18N.formatCurrencyWithSymbol(OB.DEC.mul(change, payment.mulrate), payment.symbol, payment.currencySymbolAtTheRight)); + } else if (!_.isNull(pending) && pending) { + this.$.totalpending.setContent(OB.I18N.formatCurrencyWithSymbol(OB.DEC.mul(pending, payment.mulrate), payment.symbol, payment.currencySymbolAtTheRight)); + } + this.checkEnoughCashAvailable(paymentstatus, payment); + if (!_.isNull(this.receipt) && this.receipt.get('isLayaway')) { + this.$.layawayaction.updateVisibility(true); + } } - isMultiOrders = this.model.isValidMultiOrderState(); - change = this.model.getChange(); - pending = this.model.getPending(); - if (!isMultiOrders) { - if (!_.isNull(this.receipt)) { - this.receipt.selectedPayment = payment.payment.searchKey; - paymentstatus = this.receipt.getPaymentStatus(); - } - } else { - this.model.get('multiOrders').set('selectedPayment', payment.payment.searchKey); - paymentstatus = this.model.get('multiOrders').getPaymentStatus(); + }, + paymentChanged: function (inSender, inEvent) { + var maxHeight = 115; + // Resize scroll area to fix parent panel + var component = this.model.isValidMultiOrderState() ? this.$.multiPayments : this.$.payments; + if (component.$.tempty.getShowing()) { + maxHeight -= component.$.tempty.getBounds().height; } - - if (!_.isNull(change) && change) { - this.$.change.setContent(OB.I18N.formatCurrencyWithSymbol(OB.DEC.mul(change, payment.mulrate), payment.symbol, payment.currencySymbolAtTheRight)); - OB.MobileApp.model.set('changeReceipt', OB.I18N.formatCurrencyWithSymbol(OB.DEC.mul(change, payment.mulrate), payment.symbol, payment.currencySymbolAtTheRight)); - } else if (!_.isNull(pending) && pending) { - this.$.totalpending.setContent(OB.I18N.formatCurrencyWithSymbol(OB.DEC.mul(pending, payment.mulrate), payment.symbol, payment.currencySymbolAtTheRight)); - } - this.checkEnoughCashAvailable(paymentstatus, payment); - if (!_.isNull(this.receipt) && this.receipt.get('isLayaway')) { - this.$.layawayaction.updateVisibility(true); - } + component.$.scrollArea.setStyle("height: " + maxHeight + "px"); + // Scroll to bottom + var height = 0; + component.$.tbody.children.forEach(function (line) { + height += line.getBounds().height; + }); + component.$.scrollArea.setScrollTop(height - maxHeight); + this.$.paymentMethodSelect.setContent(OB.I18N.getLabel('OBPOS_PaymentsSelectedMethod', [inEvent.payment.payment._identifier])); }, maxLimitAmountError: function (inSender, inEvent) { var maxHeight; @@ -178,7 +221,12 @@ showing: false }] }] - + }, { + classes: 'span12', + components: [{ + name: 'paymentMethodSelect', + style: 'color: orange; padding-left: 1em' + }] }, { classes: 'span12', components: [{ diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js --- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js +++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2013 Openbravo S.L.U. + * Copyright (C) 2013-2014 Openbravo S.L.U. * Licensed under the Openbravo Commercial License version 1.0 * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html * or in the legal folder of this module distribution. @@ -62,6 +62,7 @@ onSetDiscountQty: 'discountQtyChanged', onLineChecked: 'checkedLine', onStatusChanged: 'statusChanged', + onPaymentChanged: 'paymentChanged', onLayaways: 'layaways', onChangeSalesRepresentative: 'changeSalesRepresentative', onMaxLimitAmountError: 'maxLimitAmountError', @@ -191,6 +192,9 @@ }, { kind: 'OB.UI.ModalSearchFilterBuilder', name: 'modalsearchfilterbuilder' + }, { + kind: 'OB.OBPOSPointOfSale.UI.Modals.modalPaymentsSelect', + name: 'modalPaymentsSelect' }] }, { name: 'mainSubWindow', @@ -836,6 +840,10 @@ value: inEvent }); }, + paymentChanged: function (inSender, inEvent) { + // sending the event to the components bellow this one + this.waterfall('onButtonPaymentChanged', inEvent); + }, layaways: function (inSender, inEvent) { this.$.modalPaidReceipts.setParams({ isLayaway: true diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-right.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-right.js --- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-right.js +++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-right.js @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2012-2014 Openbravo S.L.U. + * Copyright (C) 2012-2015 Openbravo S.L.U. * Licensed under the Openbravo Commercial License version 1.0 * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html * or in the legal folder of this module distribution. | |||||||
Relationships [ Relation Graph ] [ Dependency Graph ] | ||||||||
|
Notes | |
(0069940) rafademiguel (developer) 2014-09-03 11:53 |
There is a branch for this: https://code.openbravo.com/erp/pmods-branches/org.openbravo.retail.posterminal.paymenth [^] over 3.0RR14Q2.3 I attach a diff over pi |
(0071463) psarobe (manager) 2014-11-06 13:29 |
There is an issue. Please take it into account when doing the code review. It is the following: After configuring everything in the backend, for example adding one category to a couple of payment methods, when login again into WebPOS the payment panel is not refreshed and you still see the payment methods as it was before of configuring. The expected result would be to see just the category as a button "Payment method" |
(0074352) guillermogil (manager) 2015-02-11 13:47 |
Here you can find the development merge with 3.0RR15Q1.1 https://code.openbravo.com/erp/pmods-branches/org.openbravo.retail.posterminal.paymenth [^] |
(0074354) guillermogil (manager) 2015-02-11 15:32 |
You can find attached a diff from 15Q1.1 |
(0074581) hgbot (developer) 2015-02-18 10:29 |
Repository: erp/pmods/org.openbravo.retail.posterminal Changeset: 992add0c4ec339ecd3cb73d30ee42c95c7974485 Author: Miguel de Juana <miguel.dejuana <at> openbravo.com> Date: Wed Feb 18 10:28:19 2015 +0100 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/992add0c4ec339ecd3cb73d30ee42c95c7974485 [^] Related to issue 27534: Merge PAYMENT METHOD HIERARCHY - Ability to group different payment methods in just one button --- M src-db/database/model/tables/OBPOS_APP_PAYMENT_TYPE.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-db/database/sourcedata/AD_MENU.xml M src-db/database/sourcedata/AD_MESSAGE.xml M src-db/database/sourcedata/AD_TAB.xml M src-db/database/sourcedata/AD_TABLE.xml M src-db/database/sourcedata/AD_TREENODE.xml M src-db/database/sourcedata/AD_WINDOW.xml M src/org/openbravo/retail/posterminal/OBPOSComponentProvider.java M src/org/openbravo/retail/posterminal/term/Payments.java M web/org.openbravo.retail.posterminal/css/obpos-main.css M web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js M web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js M web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js M web/org.openbravo.retail.posterminal/js/pointofsale/view/toolbar-right.js A src-db/database/model/tables/OBPOS_PAY_METHOD_CATEGORY.xml A web/org.openbravo.retail.posterminal/js/pointofsale/view/modals/modalpayments.js --- |
(0074633) hgbot (developer) 2015-02-19 09:01 |
Repository: erp/pmods/org.openbravo.retail.posterminal Changeset: 7618908dd2672db0e4256ec2a59c0d7ddd2f3e12 Author: Eduardo Becerra <ebec70 <at> yahoo.com> Date: Wed Feb 18 18:09:10 2015 +0100 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/7618908dd2672db0e4256ec2a59c0d7ddd2f3e12 [^] Related issue 27534: Bug fixed on select payment method from grouped payments --- M src-db/database/sourcedata/AD_MESSAGE.xml M web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js M web/org.openbravo.retail.posterminal/js/pointofsale/view/modals/modalpayments.js M web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js M web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js A web/org.openbravo.retail.posterminal/img/PMImgNotAvailable.png --- |
(0074636) hgbot (developer) 2015-02-19 09:05 |
Repository: erp/pmods/org.openbravo.retail.posterminal Changeset: dc521597d18e9704b6dd532520d35986de82d8f1 Author: Guillermo Gil <guillermo.gil <at> openbravo.com> Date: Thu Feb 19 09:04:51 2015 +0100 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/dc521597d18e9704b6dd532520d35986de82d8f1 [^] Related to issue 27534:Bug fixed on select payment method from grouped payments Modified copyright info --- M web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js M web/org.openbravo.retail.posterminal/js/pointofsale/view/modals/modalpayments.js --- |
(0074687) hgbot (developer) 2015-02-20 08:55 |
Repository: erp/pmods/org.openbravo.retail.posterminal Changeset: fcc90e21d88382c65b42c5a1de2dd5a4bea90141 Author: Eduardo Becerra <ebec70 <at> yahoo.com> Date: Thu Feb 19 18:41:54 2015 +0100 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/fcc90e21d88382c65b42c5a1de2dd5a4bea90141 [^] Related to issue 27534:Bug fixed on select payment method from grouped payments --- M src-db/database/sourcedata/AD_MESSAGE.xml M web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js M web/org.openbravo.retail.posterminal/js/pointofsale/view/modals/modalpayments.js M web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js M web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js --- |
(0074691) hgbot (developer) 2015-02-20 10:36 |
Repository: erp/pmods/org.openbravo.retail.posterminal Changeset: f9782f4604685b88ec1c6059167661ed94be53a4 Author: Eduardo Becerra <ebec70 <at> yahoo.com> Date: Fri Feb 20 10:12:01 2015 +0100 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/f9782f4604685b88ec1c6059167661ed94be53a4 [^] Related to issue 27534:Bug fixed on select payment method from grouped payments --- M web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js M web/org.openbravo.retail.posterminal/js/pointofsale/view/modals/modalpayments.js M web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js --- |
(0074698) migueldejuana (developer) 2015-02-20 12:43 |
Tested and reviewed in f9782f460468 |
Issue History | |||
Date Modified | Username | Field | Change |
2014-09-03 11:51 | rafademiguel | New Issue | |
2014-09-03 11:51 | rafademiguel | Assigned To | => ebecerra |
2014-09-03 11:51 | rafademiguel | Triggers an Emergency Pack | => No |
2014-09-03 11:53 | rafademiguel | Note Added: 0069940 | |
2014-09-03 12:06 | rafademiguel | File Added: org.openbravo.retail.posterminal.paymenth.diff | |
2014-09-09 16:18 | rafademiguel | Issue Monitored: rafademiguel | |
2014-11-06 13:29 | psarobe | Note Added: 0071463 | |
2015-02-11 13:46 | guillermogil | File Deleted: org.openbravo.retail.posterminal.paymenth.diff | |
2015-02-11 13:47 | guillermogil | Note Added: 0074352 | |
2015-02-11 15:31 | guillermogil | File Added: posTerminal-PaymentMethodHierarchy.diff | |
2015-02-11 15:32 | guillermogil | Note Added: 0074354 | |
2015-02-18 10:29 | hgbot | Checkin | |
2015-02-18 10:29 | hgbot | Note Added: 0074581 | |
2015-02-19 09:01 | hgbot | Checkin | |
2015-02-19 09:01 | hgbot | Note Added: 0074633 | |
2015-02-19 09:05 | hgbot | Checkin | |
2015-02-19 09:05 | hgbot | Note Added: 0074636 | |
2015-02-20 08:55 | hgbot | Checkin | |
2015-02-20 08:55 | hgbot | Note Added: 0074687 | |
2015-02-20 08:56 | guillermogil | Review Assigned To | => migueldejuana |
2015-02-20 08:56 | guillermogil | Issue Monitored: migueldejuana | |
2015-02-20 10:36 | hgbot | Checkin | |
2015-02-20 10:36 | hgbot | Note Added: 0074691 | |
2015-02-20 12:28 | guillermogil | Status | new => scheduled |
2015-02-20 12:28 | guillermogil | fix_in_branch | => pi |
2015-02-20 12:28 | guillermogil | Status | scheduled => resolved |
2015-02-20 12:28 | guillermogil | Resolution | open => fixed |
2015-02-20 12:43 | migueldejuana | Note Added: 0074698 | |
2015-02-20 12:43 | migueldejuana | Status | resolved => closed |
2015-05-04 13:24 | Orekaria | Relationship added | causes 0029558 |
2015-05-04 14:30 | hgbot | Checkin | |
2015-05-04 14:30 | hgbot | Note Added: 0076943 | |
2015-05-04 14:30 | hgbot | Status | closed => resolved |
2015-05-04 14:30 | hgbot | Fixed in SCM revision | => http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/be41fa54856eb9372726d4ad4a653cf2920296b2 [^] |
2015-05-04 14:34 | Orekaria | Note Deleted: 0076943 | |
2015-05-04 14:34 | Orekaria | Status | resolved => closed |
Copyright © 2000 - 2009 MantisBT Group |