0033113: It is not possible to define at Store level a the Report for Cash Management templates by default.

diff --git a/src-db/database/model/modifiedTables/AD_ORG.xml b/src-db/database/model/modifiedTables/AD_ORG.xml --- a/src-db/database/model/modifiedTables/AD_ORG.xml +++ b/src-db/database/model/modifiedTables/AD_ORG.xml @@ -65,6 +65,13 @@ <default/> <onCreateDefault/> </column> + <column name="EM_OBPOS_CASHMGM_TEMPLATE_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false"> + <default/> + <onCreateDefault/> + </column> + <foreign-key foreignTable="OBPOS_PRINT_TEMPLATE" name="EM_OBPOS_ORG_CASHMGM"> + <reference local="EM_OBPOS_CASHMGM_TEMPLATE_ID" foreign="OBPOS_PRINT_TEMPLATE_ID"/> + </foreign-key> <foreign-key foreignTable="OBPOS_PRINT_TEMPLATE" name="EM_OBPOS_ORG_CASHUPTEMP"> <reference local="EM_OBPOS_CASHUP_TEMPLATE_ID" foreign="OBPOS_PRINT_TEMPLATE_ID"/> </foreign-key> 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 @@ -8156,6 +8156,44 @@  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> </AD_COLUMN> +<AD_COLUMN> + <AD_COLUMN_ID><![CDATA[95502977EBEF44D7B069107946A80505]]></AD_COLUMN_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[EM_Obpos_Cashmgm_Template_ID]]></NAME> + <COLUMNNAME><![CDATA[EM_Obpos_Cashmgm_Template_ID]]></COLUMNNAME> + <AD_TABLE_ID><![CDATA[155]]></AD_TABLE_ID> + <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID> + <AD_REFERENCE_VALUE_ID><![CDATA[BDA324CB4B8847C3A1D2318E978BA08A]]></AD_REFERENCE_VALUE_ID> + <AD_VAL_RULE_ID><![CDATA[9007CCD9E7E04C9EA25269C8DAE5B353]]></AD_VAL_RULE_ID> + <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH> + <ISKEY><![CDATA[N]]></ISKEY> + <ISPARENT><![CDATA[N]]></ISPARENT> + <ISMANDATORY><![CDATA[N]]></ISMANDATORY> + <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> + <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> + <SEQNO><![CDATA[411]]></SEQNO> + <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> + <AD_ELEMENT_ID><![CDATA[CF4EC7579ECA4453A2AD460E92659C15]]></AD_ELEMENT_ID> + <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> + <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> + <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> + <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> + <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> + <POSITION><![CDATA[55]]></POSITION> + <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> + <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> + <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> + <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> + <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> + <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> + <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> + <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> +</AD_COLUMN> + <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[965754AFC32A4745B43F7E76172477A9]]></AD_COLUMN_ID>  <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 @@ -1894,6 +1894,18 @@  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> </AD_ELEMENT> +<AD_ELEMENT> + <AD_ELEMENT_ID><![CDATA[CF4EC7579ECA4453A2AD460E92659C15]]></AD_ELEMENT_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <COLUMNNAME><![CDATA[EM_Obpos_Cashmgm_Template_ID]]></COLUMNNAME> + <NAME><![CDATA[Cash Management Template]]></NAME> + <PRINTNAME><![CDATA[Cash Management Template]]></PRINTNAME> + <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> + <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> +</AD_ELEMENT> + <AD_ELEMENT>  <AD_ELEMENT_ID><![CDATA[D10251DF8D32491BA86F6BB08C86E789]]></AD_ELEMENT_ID>  <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 @@ -5386,6 +5386,34 @@  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> </AD_FIELD> +<AD_FIELD> + <AD_FIELD_ID><![CDATA[9FE5706DFEEC4541A328B230FFE946AB]]></AD_FIELD_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Cash Management Template]]></NAME> + <HELP><![CDATA[Template to be used when printing Cash Management report from Web POS]]></HELP> + <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> + <AD_TAB_ID><![CDATA[143]]></AD_TAB_ID> + <AD_COLUMN_ID><![CDATA[95502977EBEF44D7B069107946A80505]]></AD_COLUMN_ID> + <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> + <AD_FIELDGROUP_ID><![CDATA[6E343F57D4DF4F7886963AF2AAFAFF87]]></AD_FIELDGROUP_ID> + <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> + <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH> + <ISREADONLY><![CDATA[N]]></ISREADONLY> + <SEQNO><![CDATA[515]]></SEQNO> + <ISSAMELINE><![CDATA[N]]></ISSAMELINE> + <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> + <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> + <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> + <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> + <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> + <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> + <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> + <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> + <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> +</AD_FIELD> + <AD_FIELD>  <AD_FIELD_ID><![CDATA[A06E81945010460191C6DC9364392EC5]]></AD_FIELD_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src-db/database/sourcedata/AD_REF_LIST.xml b/src-db/database/sourcedata/AD_REF_LIST.xml --- a/src-db/database/sourcedata/AD_REF_LIST.xml +++ b/src-db/database/sourcedata/AD_REF_LIST.xml @@ -1044,6 +1044,17 @@  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> </AD_REF_LIST> +<AD_REF_LIST> + <AD_REF_LIST_ID><![CDATA[CB85FFDE7BF34019BD97F0A2CC2CED54]]></AD_REF_LIST_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <VALUE><![CDATA[CashManagement]]></VALUE> + <NAME><![CDATA[Cash Management]]></NAME> + <AD_REFERENCE_ID><![CDATA[A64C98EEC3DA45A4B784A3E28B4FAC3E]]></AD_REFERENCE_ID> + <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +</AD_REF_LIST> + <AD_REF_LIST>  <AD_REF_LIST_ID><![CDATA[CE0B6F39F4C74D0E864D77D7D827D573]]></AD_REF_LIST_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src-db/database/sourcedata/AD_VAL_RULE.xml b/src-db/database/sourcedata/AD_VAL_RULE.xml --- a/src-db/database/sourcedata/AD_VAL_RULE.xml +++ b/src-db/database/sourcedata/AD_VAL_RULE.xml @@ -136,6 +136,17 @@  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> </AD_VAL_RULE> +<AD_VAL_RULE> + <AD_VAL_RULE_ID><![CDATA[9007CCD9E7E04C9EA25269C8DAE5B353]]></AD_VAL_RULE_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <NAME><![CDATA[Print Template - Cash Management]]></NAME> + <TYPE><![CDATA[S]]></TYPE> + <CODE><![CDATA[template_type = 'CashManagement']]></CODE> + <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> +</AD_VAL_RULE> + <AD_VAL_RULE>  <AD_VAL_RULE_ID><![CDATA[9A26DE9B85C44E8886DA1F284560C31F]]></AD_VAL_RULE_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src-db/database/sourcedata/OBPOS_PRINT_TEMPLATE.xml b/src-db/database/sourcedata/OBPOS_PRINT_TEMPLATE.xml --- a/src-db/database/sourcedata/OBPOS_PRINT_TEMPLATE.xml +++ b/src-db/database/sourcedata/OBPOS_PRINT_TEMPLATE.xml @@ -36,6 +36,18 @@  <ISPDF><![CDATA[N]]></ISPDF> </OBPOS_PRINT_TEMPLATE> +<OBPOS_PRINT_TEMPLATE> + <OBPOS_PRINT_TEMPLATE_ID><![CDATA[3B7BABEB889F4D3B9366486C30CA3A68]]></OBPOS_PRINT_TEMPLATE_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID> + <NAME><![CDATA[Default Cash Management Template]]></NAME> + <TEMPLATE_TYPE><![CDATA[CashManagement]]></TEMPLATE_TYPE> + <TEMPLATE_PATH><![CDATA[res/printcashmgmt.xml]]></TEMPLATE_PATH> + <ISPDF><![CDATA[N]]></ISPDF> +</OBPOS_PRINT_TEMPLATE> + <OBPOS_PRINT_TEMPLATE>  <OBPOS_PRINT_TEMPLATE_ID><![CDATA[56A8FF38A1AC40A5A56AE35A373617C0]]></OBPOS_PRINT_TEMPLATE_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src/org/openbravo/retail/posterminal/term/TerminalProperties.java b/src/org/openbravo/retail/posterminal/term/TerminalProperties.java --- a/src/org/openbravo/retail/posterminal/term/TerminalProperties.java +++ b/src/org/openbravo/retail/posterminal/term/TerminalProperties.java @@ -78,6 +78,7 @@ "CASE WHEN pos.masterterminal.id is not null THEN true ELSE false END", "isslave")); addTemplateProperty(Organization.PROPERTY_OBPOSCASHUPTEMPLATE, "printCashUpTemplate", list); + addTemplateProperty(Organization.PROPERTY_OBPOSCASHMGMTEMPLATE, "printCashMgmTemplate", list); addTemplateProperty(Organization.PROPERTY_OBPOSTICKETTEMPLATE, "printTicketTemplate", list); addTemplateProperty(Organization.PROPERTY_OBPOSRETURNTEMPLATE, "printReturnTemplate", list); addTemplateProperty(Organization.PROPERTY_OBPOSINVOICETEMPLATE, "printInvoiceTemplate", list); diff --git a/web/org.openbravo.retail.posterminal/js/cashmgmt/model/cashmgmt-print.js b/web/org.openbravo.retail.posterminal/js/cashmgmt/model/cashmgmt-print.js --- a/web/org.openbravo.retail.posterminal/js/cashmgmt/model/cashmgmt-print.js +++ b/web/org.openbravo.retail.posterminal/js/cashmgmt/model/cashmgmt-print.js @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2012 Openbravo S.L.U. + * Copyright (C) 2012-2016 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,7 +12,8 @@ (function () { var PrintCashMgmt = function () { - this.templatecashmgmt = new OB.DS.HWResource(OB.OBPOSCashMgmt.Print.CashMgmtTemplate); + var terminal = OB.MobileApp.model.get('terminal'); + this.templatecashmgmt = new OB.DS.HWResource(terminal.printCashMgmTemplate || OB.OBPOSPointOfSale.Print.CashMgmTemplate); }; PrintCashMgmt.prototype.print = function (depsdropstosave) { @@ -27,6 +28,6 @@ OB.OBPOSCashMgmt.Print = OB.OBPOSCashMgmt.Print || {}; OB.OBPOSCashMgmt.Print.CashMgmt = PrintCashMgmt; - OB.OBPOSCashMgmt.Print.CashMgmtTemplate = 'res/printcashmgmt.xml'; + OB.OBPOSCashMgmt.Print.CashMgmtTemplate = PrintCashMgmt; }()); \ No newline at end of file diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-print.js b/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-print.js --- a/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-print.js +++ b/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-print.js @@ -69,6 +69,8 @@ extendHWResource(this.templatelayaway, "printLayawayTemplate"); this.templatecashup = new OB.DS.HWResource(terminal.printCashUpTemplate || OB.OBPOSPointOfSale.Print.CashUpTemplate); extendHWResource(this.templatecashup, "printCashUpTemplate"); + this.templatecashmgm = new OB.DS.HWResource(terminal.printCashMgnTemplate || OB.OBPOSPointOfSale.Print.CashMgmTemplate); + extendHWResource(this.templatecashmgm, "printCashMgmTemplate"); this.templatequotation = new OB.DS.HWResource(terminal.printQuotationTemplate || OB.OBPOSPointOfSale.Print.QuotationTemplate); extendHWResource(this.templatequotation, "printQuotationTemplate"); @@ -375,6 +377,7 @@ OB.OBPOSPointOfSale.Print.ReceiptTemplateLayaway = '../org.openbravo.retail.posterminal/res/printlayaway.xml'; OB.OBPOSPointOfSale.Print.DisplayTotal = '../org.openbravo.retail.posterminal/res/displaytotal.xml'; OB.OBPOSPointOfSale.Print.CashUpTemplate = '../org.openbravo.retail.posterminal/res/printcashup.xml'; + OB.OBPOSPointOfSale.Print.CashMgmTemplate = '../org.openbravo.retail.posterminal/res/printcashmgmt.xml'; OB.OBPOSPointOfSale.Print.GoodByeTemplate = '../org.openbravo.retail.posterminal/res/goodbye.xml'; OB.OBPOSPointOfSale.Print.WelcomeTemplate = '../org.openbravo.retail.posterminal/res/welcome.xml'; OB.OBPOSPointOfSale.Print.QuotationTemplate = '../org.openbravo.retail.posterminal/res/printquotation.xml';

Issue History
Date Modified	Username	Field	Change
2016-06-02 15:42	Osmany	New Issue
2016-06-02 15:42	Osmany	Assigned To	=> Retail
2016-06-02 15:42	Osmany	Resolution time	=> 1465423200
2016-06-02 15:42	Osmany	Triggers an Emergency Pack	=> No
2016-06-02 15:43	Osmany	Tag Attached: SER-QA
2016-06-02 15:53	Osmany	File Added: ProposedSolutionIssue33113.diff
2016-06-02 16:32	adrianromero	Assigned To	Retail => Osmany
2016-06-02 16:32	adrianromero	Status	new => scheduled
2016-06-02 18:19	Osmany	File Deleted: ProposedSolutionIssue33113.diff
2016-06-02 18:19	Osmany	File Added: ProposedSolutionIssue33113.diff
2016-06-02 18:30	Osmany	File Deleted: ProposedSolutionIssue33113.diff
2016-06-02 18:30	Osmany	File Added: ProposedSolutionIssue33113.diff
2016-06-07 14:25	hgbot	Checkin
2016-06-07 14:25	hgbot	Note Added: 0087062
2016-06-07 14:25	hgbot	Status	scheduled => resolved
2016-06-07 14:25	hgbot	Resolution	open => fixed
2016-06-07 14:25	hgbot	Fixed in SCM revision	=> http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/8edb0380c9c3f162d6dff3fae95aeba05d2907f8 [^]
2016-06-07 17:31	adrianromero	Review Assigned To	=> marvintm
2016-06-22 09:08	marvintm	Review Assigned To	marvintm => mtaal
2016-06-23 19:06	marvintm	Review Assigned To	mtaal => marvintm
2016-06-23 19:06	marvintm	Status	resolved => closed
2017-03-10 17:57	Osmany	Relationship added	related to 0035488

Notes
(0087062) hgbot (developer) 2016-06-07 14:25	Repository: erp/pmods/org.openbravo.retail.posterminal Changeset: 8edb0380c9c3f162d6dff3fae95aeba05d2907f8 Author: Osmany Garcia Machado <osmany.machado <at> peoplewalking.com> Date: Mon Jun 06 19:43:01 2016 -0600 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/8edb0380c9c3f162d6dff3fae95aeba05d2907f8 [^] Fixes issue 33113 : It is possible to define at Store level a the Report for Cash Management templates by default. --- M src-db/database/model/modifiedTables/AD_ORG.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_REF_LIST.xml M src-db/database/sourcedata/AD_VAL_RULE.xml M src-db/database/sourcedata/OBPOS_PRINT_TEMPLATE.xml M src/org/openbravo/retail/posterminal/term/TerminalProperties.java M web/org.openbravo.retail.posterminal/js/cashmgmt/model/cashmgmt-print.js M web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-print.js ---