details: https://code.openbravo.com/erp/devel/pi/rev/f1020da0f395 changeset: 16814:f1020da0f395 user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Mon Jun 11 11:50:57 2012 +0200 summary: fixed bug 19806 Change labels in General Ledger Journal
details: https://code.openbravo.com/erp/devel/pi/rev/cda4d76f5cd2 changeset: 16815:cda4d76f5cd2 user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Fri Jun 08 11:05:44 2012 +0200 summary: fixed bug 20687 Currency show always. Set this field before product details: https://code.openbravo.com/erp/devel/pi/rev/124efb216006 changeset: 16816:124efb216006 user: Naiara Martinez <naiara.martinez <at> openbravo.com> date: Mon Jun 11 10:53:01 2012 +0200 summary: fixed bug 20700 hide Reply-to field when more than one sales rep. details: https://code.openbravo.com/erp/devel/pi/rev/f35c55cdedf5 changeset: 16817:f35c55cdedf5 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Tue Jun 12 18:59:06 2012 +0200 summary: Related to issue 20700: fix typo diffstat: src-db/database/sourcedata/AD_FIELD.xml | 3 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 66 +++++----- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html | 8 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 5 +- 4 files changed, 42 insertions(+), 40 deletions(-) diffs (161 lines): diff -r 0b5e6502cd76 -r f35c55cdedf5 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Wed May 23 10:55:08 2012 +0200 +++ b/src-db/database/sourcedata/AD_FIELD.xml Tue Jun 12 18:59:06 2012 +0200 @@ -115875,10 +115875,9 @@ <!--801458--> <AD_TAB_ID><![CDATA[800078]]></AD_TAB_ID> <!--801458--> <AD_COLUMN_ID><![CDATA[801065]]></AD_COLUMN_ID> <!--801458--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> -<!--801458--> <DISPLAYLOGIC><![CDATA[@IsDepreciated@='Y']]></DISPLAYLOGIC> <!--801458--> <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH> <!--801458--> <ISREADONLY><![CDATA[N]]></ISREADONLY> -<!--801458--> <SEQNO><![CDATA[80]]></SEQNO> +<!--801458--> <SEQNO><![CDATA[69]]></SEQNO> <!--801458--> <ISSAMELINE><![CDATA[Y]]></ISSAMELINE> <!--801458--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> <!--801458--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> diff -r 0b5e6502cd76 -r f35c55cdedf5 src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Wed May 23 10:55:08 2012 +0200 +++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Tue Jun 12 18:59:06 2012 +0200 @@ -12791,6 +12791,17 @@ <!--02E4CF0415C84120B759B7E2E5146558--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--02E4CF0415C84120B759B7E2E5146558--></AD_TEXTINTERFACES> +<!--03FF12EC8B584FE093B398181957431A--><AD_TEXTINTERFACES> +<!--03FF12EC8B584FE093B398181957431A--> <AD_TEXTINTERFACES_ID><![CDATA[03FF12EC8B584FE093B398181957431A]]></AD_TEXTINTERFACES_ID> +<!--03FF12EC8B584FE093B398181957431A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--03FF12EC8B584FE093B398181957431A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--03FF12EC8B584FE093B398181957431A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--03FF12EC8B584FE093B398181957431A--> <TEXT><![CDATA[Show P&L Closing Entries]]></TEXT> +<!--03FF12EC8B584FE093B398181957431A--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html]]></FILENAME> +<!--03FF12EC8B584FE093B398181957431A--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--03FF12EC8B584FE093B398181957431A--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--03FF12EC8B584FE093B398181957431A--></AD_TEXTINTERFACES> + <!--043304C07CB44C50B8FE73C57A3D157F--><AD_TEXTINTERFACES> <!--043304C07CB44C50B8FE73C57A3D157F--> <AD_TEXTINTERFACES_ID><![CDATA[043304C07CB44C50B8FE73C57A3D157F]]></AD_TEXTINTERFACES_ID> <!--043304C07CB44C50B8FE73C57A3D157F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -14055,6 +14066,17 @@ <!--50AAFE528283409E997BA000F7C61ABF--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--50AAFE528283409E997BA000F7C61ABF--></AD_TEXTINTERFACES> +<!--518C5EF886394397BDE1550839DED433--><AD_TEXTINTERFACES> +<!--518C5EF886394397BDE1550839DED433--> <AD_TEXTINTERFACES_ID><![CDATA[518C5EF886394397BDE1550839DED433]]></AD_TEXTINTERFACES_ID> +<!--518C5EF886394397BDE1550839DED433--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--518C5EF886394397BDE1550839DED433--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--518C5EF886394397BDE1550839DED433--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--518C5EF886394397BDE1550839DED433--> <TEXT><![CDATA[Show Closing Entries]]></TEXT> +<!--518C5EF886394397BDE1550839DED433--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html]]></FILENAME> +<!--518C5EF886394397BDE1550839DED433--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--518C5EF886394397BDE1550839DED433--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--518C5EF886394397BDE1550839DED433--></AD_TEXTINTERFACES> + <!--520A3E4E01744392BBBD82F6DD1D8A7E--><AD_TEXTINTERFACES> <!--520A3E4E01744392BBBD82F6DD1D8A7E--> <AD_TEXTINTERFACES_ID><![CDATA[520A3E4E01744392BBBD82F6DD1D8A7E]]></AD_TEXTINTERFACES_ID> <!--520A3E4E01744392BBBD82F6DD1D8A7E--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -19036,39 +19058,6 @@ <!--9DA67547DD512BAAE040007F01002B99--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--9DA67547DD512BAAE040007F01002B99--></AD_TEXTINTERFACES> -<!--9DA67547DD532BAAE040007F01002B99--><AD_TEXTINTERFACES> -<!--9DA67547DD532BAAE040007F01002B99--> <AD_TEXTINTERFACES_ID><![CDATA[9DA67547DD532BAAE040007F01002B99]]></AD_TEXTINTERFACES_ID> -<!--9DA67547DD532BAAE040007F01002B99--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--9DA67547DD532BAAE040007F01002B99--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--9DA67547DD532BAAE040007F01002B99--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--9DA67547DD532BAAE040007F01002B99--> <TEXT><![CDATA[Show Regularization]]></TEXT> -<!--9DA67547DD532BAAE040007F01002B99--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html]]></FILENAME> -<!--9DA67547DD532BAAE040007F01002B99--> <ISUSED><![CDATA[Y]]></ISUSED> -<!--9DA67547DD532BAAE040007F01002B99--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> -<!--9DA67547DD532BAAE040007F01002B99--></AD_TEXTINTERFACES> - -<!--9DA67547DD552BAAE040007F01002B99--><AD_TEXTINTERFACES> -<!--9DA67547DD552BAAE040007F01002B99--> <AD_TEXTINTERFACES_ID><![CDATA[9DA67547DD552BAAE040007F01002B99]]></AD_TEXTINTERFACES_ID> -<!--9DA67547DD552BAAE040007F01002B99--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--9DA67547DD552BAAE040007F01002B99--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--9DA67547DD552BAAE040007F01002B99--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--9DA67547DD552BAAE040007F01002B99--> <TEXT><![CDATA[Show Opening]]></TEXT> -<!--9DA67547DD552BAAE040007F01002B99--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html]]></FILENAME> -<!--9DA67547DD552BAAE040007F01002B99--> <ISUSED><![CDATA[Y]]></ISUSED> -<!--9DA67547DD552BAAE040007F01002B99--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> -<!--9DA67547DD552BAAE040007F01002B99--></AD_TEXTINTERFACES> - -<!--9DA67547DD572BAAE040007F01002B99--><AD_TEXTINTERFACES> -<!--9DA67547DD572BAAE040007F01002B99--> <AD_TEXTINTERFACES_ID><![CDATA[9DA67547DD572BAAE040007F01002B99]]></AD_TEXTINTERFACES_ID> -<!--9DA67547DD572BAAE040007F01002B99--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--9DA67547DD572BAAE040007F01002B99--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--9DA67547DD572BAAE040007F01002B99--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--9DA67547DD572BAAE040007F01002B99--> <TEXT><![CDATA[Show Closing]]></TEXT> -<!--9DA67547DD572BAAE040007F01002B99--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html]]></FILENAME> -<!--9DA67547DD572BAAE040007F01002B99--> <ISUSED><![CDATA[Y]]></ISUSED> -<!--9DA67547DD572BAAE040007F01002B99--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> -<!--9DA67547DD572BAAE040007F01002B99--></AD_TEXTINTERFACES> - <!--9DA67547DD592BAAE040007F01002B99--><AD_TEXTINTERFACES> <!--9DA67547DD592BAAE040007F01002B99--> <AD_TEXTINTERFACES_ID><![CDATA[9DA67547DD592BAAE040007F01002B99]]></AD_TEXTINTERFACES_ID> <!--9DA67547DD592BAAE040007F01002B99--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -20004,6 +19993,17 @@ <!--C6D6BFADC651498BB0631E37EC566961--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--C6D6BFADC651498BB0631E37EC566961--></AD_TEXTINTERFACES> +<!--C769FCC281B14F768BB5E4D5F9721B20--><AD_TEXTINTERFACES> +<!--C769FCC281B14F768BB5E4D5F9721B20--> <AD_TEXTINTERFACES_ID><![CDATA[C769FCC281B14F768BB5E4D5F9721B20]]></AD_TEXTINTERFACES_ID> +<!--C769FCC281B14F768BB5E4D5F9721B20--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--C769FCC281B14F768BB5E4D5F9721B20--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--C769FCC281B14F768BB5E4D5F9721B20--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--C769FCC281B14F768BB5E4D5F9721B20--> <TEXT><![CDATA[Show Opening Entries]]></TEXT> +<!--C769FCC281B14F768BB5E4D5F9721B20--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html]]></FILENAME> +<!--C769FCC281B14F768BB5E4D5F9721B20--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--C769FCC281B14F768BB5E4D5F9721B20--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--C769FCC281B14F768BB5E4D5F9721B20--></AD_TEXTINTERFACES> + <!--C78656AD3E214640B3AF6ECA1A4BEEA1--><AD_TEXTINTERFACES> <!--C78656AD3E214640B3AF6ECA1A4BEEA1--> <AD_TEXTINTERFACES_ID><![CDATA[C78656AD3E214640B3AF6ECA1A4BEEA1]]></AD_TEXTINTERFACES_ID> <!--C78656AD3E214640B3AF6ECA1A4BEEA1--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 0b5e6502cd76 -r f35c55cdedf5 src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html --- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html Wed May 23 10:55:08 2012 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerJournal.html Tue Jun 12 18:59:06 2012 +0200 @@ -13,7 +13,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2001-2011 Openbravo SLU + * All portions are Copyright (C) 2001-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -354,14 +354,14 @@ <td class="TitleCell"><span class="LabelText">Show Regular Entries</span></td> <td class="Radio_Check_ContentCell"><input TYPE="checkbox" id="paramShowRegular" name="inpShowRegular" value="Y"/></td> <td class="ContentCell"></td> - <td class="TitleCell"><span class="LabelText">Show Regularization</span></td> + <td class="TitleCell"><span class="LabelText">Show P&L Closing Entries</span></td> <td class="Radio_Check_ContentCell"><input TYPE="checkbox" id="paramShowReg" name="inpShowReg" value="Y"/></td> </tr> <tr> - <td class="TitleCell"><span class="LabelText">Show Opening</span></td> + <td class="TitleCell"><span class="LabelText">Show Opening Entries</span></td> <td class="Radio_Check_ContentCell"><input TYPE="checkbox" id="paramShowOpening" name="inpShowOpening" value="Y"/></td> <td class="ContentCell"></td> - <td class="TitleCell"><span class="LabelText">Show Closing</span></td> + <td class="TitleCell"><span class="LabelText">Show Closing Entries</span></td> <td class="Radio_Check_ContentCell"><input TYPE="checkbox" id="paramShowClosing" name="inpShowClosing" value="Y"/></td> </tr> <tr> diff -r 0b5e6502cd76 -r f35c55cdedf5 src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java --- a/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java Wed May 23 10:55:08 2012 +0200 +++ b/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java Tue Jun 12 18:59:06 2012 +0200 @@ -1203,11 +1203,14 @@ // sales Rep. to choose one of the 3 possibilities // 1.- n customer n sales rep (hide "To" and "Reply-to" inputs) // 2.- n customers 1 sales rep (hide "To" input) - // 3.- Otherwise show both + // 3.- 1 customer n sales rep (hide Reply-to inputs) + // 4.- Otherwise show both if (moreThanOneCustomer && moreThanOnesalesRep) { discard = new String[] { "to", "to_bottomMargin", "replyTo", "replyTo_bottomMargin" }; } else if (moreThanOneCustomer) { discard = new String[] { "to", "to_bottomMargin", "multSalesRep", "multSalesRepCount" }; + } else if (moreThanOnesalesRep) { + discard = new String[] { "replyTo", "replyTo_bottomMargin" }; } else { discard = new String[] { "multipleCustomer", "multipleCustomer_bottomMargin" }; } ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
