details: https://code.openbravo.com/erp/devel/pi/rev/c8f2283eec83 changeset: 21932:c8f2283eec83 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Mon Feb 03 18:14:15 2014 +0530 summary: Fixes Issue 24670: Export real data to excel is not working fine in budget
details: https://code.openbravo.com/erp/devel/pi/rev/dd46c48959ec changeset: 21933:dd46c48959ec user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Wed Feb 05 16:27:42 2014 +0530 summary: Fixes Issue 25550: Attibute Set Value field does not represent well the information filled details: https://code.openbravo.com/erp/devel/pi/rev/618294c2a0b7 changeset: 21934:618294c2a0b7 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Mon Feb 03 21:41:52 2014 +0530 summary: Fixes Issue 25644: Cannot create a work effort from a work requirement details: https://code.openbravo.com/erp/devel/pi/rev/e582d3f6dc38 changeset: 21935:e582d3f6dc38 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Wed Feb 05 17:00:36 2014 +0530 summary: Fixes Issue 25605: The orders created by copy order functionality, can not be shipped using create lines from of create shipment from orders details: https://code.openbravo.com/erp/devel/pi/rev/1b42bc018496 changeset: 21936:1b42bc018496 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Wed Feb 05 17:28:23 2014 +0530 summary: Fixes Issue 25529: Sales rep does not change when the user changes the business partner diffstat: modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java | 1 + src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 99 ++++++++++ src/org/openbravo/erpCommon/ad_actionButton/CreateWorkEffort.java | 6 +- src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java | 2 - src/org/openbravo/erpCommon/ad_reports/ReportBudgetExportExcel.java | 29 ++- src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcel.html | 22 +- src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcel.java | 81 ++++++- src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcel.xml | 20 +- src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcelExportXLS.html | 12 +- src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcelExportXLS.xml | 5 +- src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcelXLS.html | 12 +- src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcelXLS.xml | 5 +- src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcel_data.xsql | 39 +-- src/org/openbravo/erpCommon/info/AttributeSetInstance.java | 16 +- 14 files changed, 268 insertions(+), 81 deletions(-) diffs (truncated from 718 to 300 lines): diff -r 09050a5b4162 -r 1b42bc018496 modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java Fri Feb 07 15:16:17 2014 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/businesslogic/CloneOrderActionHandler.java Wed Feb 05 17:28:23 2014 +0530 @@ -65,6 +65,7 @@ objCloneOrder.setDocumentStatus("DR"); objCloneOrder.setPosted("N"); objCloneOrder.setProcessed(false); + objCloneOrder.setDelivered(false); objCloneOrder.setSalesTransaction(true); objCloneOrder.setDocumentNo(null); objCloneOrder.setSalesTransaction(objOrder.isSalesTransaction()); diff -r 09050a5b4162 -r 1b42bc018496 src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Fri Feb 07 15:16:17 2014 +0100 +++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Wed Feb 05 17:28:23 2014 +0530 @@ -12879,6 +12879,17 @@ <!--09E3996786EF4AFCB9FD14145B7248A5--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--09E3996786EF4AFCB9FD14145B7248A5--></AD_TEXTINTERFACES> +<!--0A51A6A21E844A518F9EB3D252F41E6C--><AD_TEXTINTERFACES> +<!--0A51A6A21E844A518F9EB3D252F41E6C--> <AD_TEXTINTERFACES_ID><![CDATA[0A51A6A21E844A518F9EB3D252F41E6C]]></AD_TEXTINTERFACES_ID> +<!--0A51A6A21E844A518F9EB3D252F41E6C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--0A51A6A21E844A518F9EB3D252F41E6C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--0A51A6A21E844A518F9EB3D252F41E6C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--0A51A6A21E844A518F9EB3D252F41E6C--> <TEXT><![CDATA[Cost Center]]></TEXT> +<!--0A51A6A21E844A518F9EB3D252F41E6C--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcelXLS.html]]></FILENAME> +<!--0A51A6A21E844A518F9EB3D252F41E6C--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--0A51A6A21E844A518F9EB3D252F41E6C--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--0A51A6A21E844A518F9EB3D252F41E6C--></AD_TEXTINTERFACES> + <!--0AB88EF426844BBDB58120DC8038851B--><AD_TEXTINTERFACES> <!--0AB88EF426844BBDB58120DC8038851B--> <AD_TEXTINTERFACES_ID><![CDATA[0AB88EF426844BBDB58120DC8038851B]]></AD_TEXTINTERFACES_ID> <!--0AB88EF426844BBDB58120DC8038851B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -13879,6 +13890,28 @@ <!--413F936C37AA4E0D865BD0109ECAE092--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--413F936C37AA4E0D865BD0109ECAE092--></AD_TEXTINTERFACES> +<!--41CF5413E10E48369D2AC3CA6D6043A9--><AD_TEXTINTERFACES> +<!--41CF5413E10E48369D2AC3CA6D6043A9--> <AD_TEXTINTERFACES_ID><![CDATA[41CF5413E10E48369D2AC3CA6D6043A9]]></AD_TEXTINTERFACES_ID> +<!--41CF5413E10E48369D2AC3CA6D6043A9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--41CF5413E10E48369D2AC3CA6D6043A9--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--41CF5413E10E48369D2AC3CA6D6043A9--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--41CF5413E10E48369D2AC3CA6D6043A9--> <TEXT><![CDATA[Cost Center]]></TEXT> +<!--41CF5413E10E48369D2AC3CA6D6043A9--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcelExportXLS.html]]></FILENAME> +<!--41CF5413E10E48369D2AC3CA6D6043A9--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--41CF5413E10E48369D2AC3CA6D6043A9--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--41CF5413E10E48369D2AC3CA6D6043A9--></AD_TEXTINTERFACES> + +<!--41D653AB70244D3EA6DC190256BD8171--><AD_TEXTINTERFACES> +<!--41D653AB70244D3EA6DC190256BD8171--> <AD_TEXTINTERFACES_ID><![CDATA[41D653AB70244D3EA6DC190256BD8171]]></AD_TEXTINTERFACES_ID> +<!--41D653AB70244D3EA6DC190256BD8171--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--41D653AB70244D3EA6DC190256BD8171--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--41D653AB70244D3EA6DC190256BD8171--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--41D653AB70244D3EA6DC190256BD8171--> <TEXT><![CDATA[User2]]></TEXT> +<!--41D653AB70244D3EA6DC190256BD8171--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcelXLS.html]]></FILENAME> +<!--41D653AB70244D3EA6DC190256BD8171--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--41D653AB70244D3EA6DC190256BD8171--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--41D653AB70244D3EA6DC190256BD8171--></AD_TEXTINTERFACES> + <!--434E926805CE4AAB86F56DDF76E68352--><AD_TEXTINTERFACES> <!--434E926805CE4AAB86F56DDF76E68352--> <AD_TEXTINTERFACES_ID><![CDATA[434E926805CE4AAB86F56DDF76E68352]]></AD_TEXTINTERFACES_ID> <!--434E926805CE4AAB86F56DDF76E68352--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -15254,6 +15287,17 @@ <!--5BBACA9971B34BE5977DE7D616E3FF61--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--5BBACA9971B34BE5977DE7D616E3FF61--></AD_TEXTINTERFACES> +<!--5D555CD025D346A78ED072A6FF85D616--><AD_TEXTINTERFACES> +<!--5D555CD025D346A78ED072A6FF85D616--> <AD_TEXTINTERFACES_ID><![CDATA[5D555CD025D346A78ED072A6FF85D616]]></AD_TEXTINTERFACES_ID> +<!--5D555CD025D346A78ED072A6FF85D616--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--5D555CD025D346A78ED072A6FF85D616--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--5D555CD025D346A78ED072A6FF85D616--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--5D555CD025D346A78ED072A6FF85D616--> <TEXT><![CDATA[User1]]></TEXT> +<!--5D555CD025D346A78ED072A6FF85D616--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcel.html]]></FILENAME> +<!--5D555CD025D346A78ED072A6FF85D616--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--5D555CD025D346A78ED072A6FF85D616--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--5D555CD025D346A78ED072A6FF85D616--></AD_TEXTINTERFACES> + <!--5DA9628723CA4050B7C2220719786424--><AD_TEXTINTERFACES> <!--5DA9628723CA4050B7C2220719786424--> <AD_TEXTINTERFACES_ID><![CDATA[5DA9628723CA4050B7C2220719786424]]></AD_TEXTINTERFACES_ID> <!--5DA9628723CA4050B7C2220719786424--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -17586,6 +17630,17 @@ <!--702033B7A0794C539D2C1D52BC95464D--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--702033B7A0794C539D2C1D52BC95464D--></AD_TEXTINTERFACES> +<!--719715BA905C4315905D290B35217F2C--><AD_TEXTINTERFACES> +<!--719715BA905C4315905D290B35217F2C--> <AD_TEXTINTERFACES_ID><![CDATA[719715BA905C4315905D290B35217F2C]]></AD_TEXTINTERFACES_ID> +<!--719715BA905C4315905D290B35217F2C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--719715BA905C4315905D290B35217F2C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--719715BA905C4315905D290B35217F2C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--719715BA905C4315905D290B35217F2C--> <TEXT><![CDATA[User2]]></TEXT> +<!--719715BA905C4315905D290B35217F2C--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcel.html]]></FILENAME> +<!--719715BA905C4315905D290B35217F2C--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--719715BA905C4315905D290B35217F2C--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--719715BA905C4315905D290B35217F2C--></AD_TEXTINTERFACES> + <!--74F9FE001D3644CD918CC41E8218A508--><AD_TEXTINTERFACES> <!--74F9FE001D3644CD918CC41E8218A508--> <AD_TEXTINTERFACES_ID><![CDATA[74F9FE001D3644CD918CC41E8218A508]]></AD_TEXTINTERFACES_ID> <!--74F9FE001D3644CD918CC41E8218A508--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -18158,6 +18213,17 @@ <!--87A92A55A82A41EA9439A2A15B2E5B8C--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--87A92A55A82A41EA9439A2A15B2E5B8C--></AD_TEXTINTERFACES> +<!--8834FF4A1C39444D9CF0AF6FA1E54BE7--><AD_TEXTINTERFACES> +<!--8834FF4A1C39444D9CF0AF6FA1E54BE7--> <AD_TEXTINTERFACES_ID><![CDATA[8834FF4A1C39444D9CF0AF6FA1E54BE7]]></AD_TEXTINTERFACES_ID> +<!--8834FF4A1C39444D9CF0AF6FA1E54BE7--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--8834FF4A1C39444D9CF0AF6FA1E54BE7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--8834FF4A1C39444D9CF0AF6FA1E54BE7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--8834FF4A1C39444D9CF0AF6FA1E54BE7--> <TEXT><![CDATA[User1]]></TEXT> +<!--8834FF4A1C39444D9CF0AF6FA1E54BE7--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcelXLS.html]]></FILENAME> +<!--8834FF4A1C39444D9CF0AF6FA1E54BE7--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--8834FF4A1C39444D9CF0AF6FA1E54BE7--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--8834FF4A1C39444D9CF0AF6FA1E54BE7--></AD_TEXTINTERFACES> + <!--8884F1121ECD5F40E040007F01014076--><AD_TEXTINTERFACES> <!--8884F1121ECD5F40E040007F01014076--> <AD_TEXTINTERFACES_ID><![CDATA[8884F1121ECD5F40E040007F01014076]]></AD_TEXTINTERFACES_ID> <!--8884F1121ECD5F40E040007F01014076--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -19157,6 +19223,17 @@ <!--93508D04F2B811DDA853001D09C4A2FE--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--93508D04F2B811DDA853001D09C4A2FE--></AD_TEXTINTERFACES> +<!--935C4EBFC5324CD6AC9B03E2B5CDEE76--><AD_TEXTINTERFACES> +<!--935C4EBFC5324CD6AC9B03E2B5CDEE76--> <AD_TEXTINTERFACES_ID><![CDATA[935C4EBFC5324CD6AC9B03E2B5CDEE76]]></AD_TEXTINTERFACES_ID> +<!--935C4EBFC5324CD6AC9B03E2B5CDEE76--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--935C4EBFC5324CD6AC9B03E2B5CDEE76--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--935C4EBFC5324CD6AC9B03E2B5CDEE76--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--935C4EBFC5324CD6AC9B03E2B5CDEE76--> <TEXT><![CDATA[User1]]></TEXT> +<!--935C4EBFC5324CD6AC9B03E2B5CDEE76--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcelExportXLS.html]]></FILENAME> +<!--935C4EBFC5324CD6AC9B03E2B5CDEE76--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--935C4EBFC5324CD6AC9B03E2B5CDEE76--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--935C4EBFC5324CD6AC9B03E2B5CDEE76--></AD_TEXTINTERFACES> + <!--936F4000F2B811DD834B001D09C4A2FE--><AD_TEXTINTERFACES> <!--936F4000F2B811DD834B001D09C4A2FE--> <AD_TEXTINTERFACES_ID><![CDATA[936F4000F2B811DD834B001D09C4A2FE]]></AD_TEXTINTERFACES_ID> <!--936F4000F2B811DD834B001D09C4A2FE--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -20895,6 +20972,17 @@ <!--D55D94632B5145F1B9F341617451079F--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--D55D94632B5145F1B9F341617451079F--></AD_TEXTINTERFACES> +<!--D6836A7FA29D4396AA319E5818DB66EE--><AD_TEXTINTERFACES> +<!--D6836A7FA29D4396AA319E5818DB66EE--> <AD_TEXTINTERFACES_ID><![CDATA[D6836A7FA29D4396AA319E5818DB66EE]]></AD_TEXTINTERFACES_ID> +<!--D6836A7FA29D4396AA319E5818DB66EE--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--D6836A7FA29D4396AA319E5818DB66EE--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--D6836A7FA29D4396AA319E5818DB66EE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--D6836A7FA29D4396AA319E5818DB66EE--> <TEXT><![CDATA[User2]]></TEXT> +<!--D6836A7FA29D4396AA319E5818DB66EE--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcelExportXLS.html]]></FILENAME> +<!--D6836A7FA29D4396AA319E5818DB66EE--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--D6836A7FA29D4396AA319E5818DB66EE--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--D6836A7FA29D4396AA319E5818DB66EE--></AD_TEXTINTERFACES> + <!--D69AA41C4E364F7385E8A4CC0C7E470F--><AD_TEXTINTERFACES> <!--D69AA41C4E364F7385E8A4CC0C7E470F--> <AD_TEXTINTERFACES_ID><![CDATA[D69AA41C4E364F7385E8A4CC0C7E470F]]></AD_TEXTINTERFACES_ID> <!--D69AA41C4E364F7385E8A4CC0C7E470F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -21445,6 +21533,17 @@ <!--F4B6387C83DB41B2B42EDDB0BFD2240E--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--F4B6387C83DB41B2B42EDDB0BFD2240E--></AD_TEXTINTERFACES> +<!--F557017A81C84A8C83213778CD507AEF--><AD_TEXTINTERFACES> +<!--F557017A81C84A8C83213778CD507AEF--> <AD_TEXTINTERFACES_ID><![CDATA[F557017A81C84A8C83213778CD507AEF]]></AD_TEXTINTERFACES_ID> +<!--F557017A81C84A8C83213778CD507AEF--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--F557017A81C84A8C83213778CD507AEF--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--F557017A81C84A8C83213778CD507AEF--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--F557017A81C84A8C83213778CD507AEF--> <TEXT><![CDATA[Cost Center]]></TEXT> +<!--F557017A81C84A8C83213778CD507AEF--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcel.html]]></FILENAME> +<!--F557017A81C84A8C83213778CD507AEF--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--F557017A81C84A8C83213778CD507AEF--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--F557017A81C84A8C83213778CD507AEF--></AD_TEXTINTERFACES> + <!--F5AD6EECB9894B6F8A06545BAAC74668--><AD_TEXTINTERFACES> <!--F5AD6EECB9894B6F8A06545BAAC74668--> <AD_TEXTINTERFACES_ID><![CDATA[F5AD6EECB9894B6F8A06545BAAC74668]]></AD_TEXTINTERFACES_ID> <!--F5AD6EECB9894B6F8A06545BAAC74668--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 09050a5b4162 -r 1b42bc018496 src/org/openbravo/erpCommon/ad_actionButton/CreateWorkEffort.java --- a/src/org/openbravo/erpCommon/ad_actionButton/CreateWorkEffort.java Fri Feb 07 15:16:17 2014 +0100 +++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateWorkEffort.java Wed Feb 05 17:28:23 2014 +0530 @@ -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) 2011 Openbravo SLU + * All portions are Copyright (C) 2011-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -140,8 +140,8 @@ BigDecimal estimatedTime = BigDecimal.ZERO; if (wrOp.getEstimatedTime() != null && wrOp.getQuantity() != null && wrOp.getQuantity().compareTo(BigDecimal.ZERO) != 0) { - estimatedTime = wrOp.getEstimatedTime().divide(wrOp.getQuantity()) - .multiply(requeriedQty); + estimatedTime = wrOp.getEstimatedTime() + .divide(wrOp.getQuantity(), BigDecimal.ROUND_HALF_UP).multiply(requeriedQty); } productionPlan.setEstimatedTime(new BigDecimal(estimatedTime.longValue())); } else { diff -r 09050a5b4162 -r 1b42bc018496 src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java --- a/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java Fri Feb 07 15:16:17 2014 +0100 +++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Order_BPartner.java Wed Feb 05 17:28:23 2014 +0530 @@ -60,8 +60,6 @@ strDeliveryRule = data[0].deliveryrule.equals("") ? info.vars .getStringParameter("inpdeliveryrule") : data[0].deliveryrule; strUserRep = SEOrderBPartnerData.userIdSalesRep(this, data[0].salesrepId); - strUserRep = strUserRep.equals("") ? info.vars.getStringParameter("inpsalesrepId") - : strUserRep; SLOrderDocTypeData[] docTypeData = SLOrderDocTypeData.select(this, strDocTypeTarget); if (docTypeData != null && docTypeData.length > 0) { docSubTypeSO = docTypeData[0].docsubtypeso; diff -r 09050a5b4162 -r 1b42bc018496 src/org/openbravo/erpCommon/ad_reports/ReportBudgetExportExcel.java --- a/src/org/openbravo/erpCommon/ad_reports/ReportBudgetExportExcel.java Fri Feb 07 15:16:17 2014 +0100 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportBudgetExportExcel.java Wed Feb 05 17:28:23 2014 +0530 @@ -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) 2001-2010 Openbravo SLU + * All portions are Copyright (C) 2001-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.PrintWriter; +import java.util.HashMap; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -28,6 +29,13 @@ import org.openbravo.base.secureApp.HttpSecureAppServlet; import org.openbravo.base.secureApp.VariablesSecureApp; +import org.openbravo.dal.service.OBDal; +import org.openbravo.database.ConnectionProvider; +import org.openbravo.erpCommon.ad_process.UpdateActuals; +import org.openbravo.erpCommon.utility.OBError; +import org.openbravo.model.financialmgmt.accounting.Budget; +import org.openbravo.scheduling.ProcessBundle; +import org.openbravo.service.db.DalConnectionProvider; import org.openbravo.xmlEngine.XmlDocument; public class ReportBudgetExportExcel extends HttpSecureAppServlet { @@ -58,6 +66,25 @@ XmlDocument xmlDocument = null; ReportBudgetGenerateExcelData[] data = null; + Budget budget = OBDal.getInstance().get(Budget.class, strBudgetId); + boolean exportActualData = budget.isExportActualData(); + if (exportActualData) { + try { + ConnectionProvider conn = new DalConnectionProvider(false); + ProcessBundle pb = new ProcessBundle("ABDFC8131D964936AD2EF7E0CED97FD9", vars).init(conn); + HashMap<String, Object> parameters = new HashMap<String, Object>(); + parameters.put("C_Budget_ID", strBudgetId); + pb.setParams(parameters); + OBError myMessage = null; + new UpdateActuals().execute(pb); + myMessage = (OBError) pb.getResult(); + if (myMessage != null && "Error".equals(myMessage.getType())) { + log4j.error(myMessage.getMessage()); + } + } catch (Exception e) { + e.printStackTrace(); + } + } data = ReportBudgetGenerateExcelData.selectLines(this, vars.getLanguage(), strBudgetId); if (data.length != 0 && data[0].exportactual.equals("Y")) { diff -r 09050a5b4162 -r 1b42bc018496 src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcel.html --- a/src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcel.html Fri Feb 07 15:16:17 2014 +0100 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportBudgetGenerateExcel.html Wed Feb 05 17:28:23 2014 +0530 @@ -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-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -440,14 +440,6 @@ <td class="List_ContentCell"> <select class="List_width List_height" name="inpmProductCategoryId" size="5" multiple="" id="reportM_PRODUCTCATEGORY"> </select></td> </tr> - <!--tr> - <td width="10%" > <span >User1</span></td> - <td width="40%" > <select name="inpUser1" size="5" multiple="" id="reportUser1"> -</select></td> - <td width="10%" > <span >User2</span></td> - <td width="40%" > <select name="inpUser2" size="5" multiple="" id="reportUser2"> -</select></td> - </TR--> <tr> <td class="TitleCell"><span class="LabelText">Sales Region</span></td> <td colspan="2" class="List_ContentCell"> <select class="List_width List_height" name="inpcSalesRegionId" size="5" multiple="" id="reportCSalesRegionId"></select></td> @@ -463,9 +455,19 @@ <tr> <td class="TitleCell"><span class="LabelText">Trx organization</span></td> <td colspan="2" class="List_ContentCell"> <select class="List_width List_height" name="inpTrxOrg" size="5" multiple="" id="reportTrxOrg"></select></td> + <td class="TitleCell"><span class="LabelText">Cost Center</span></td> + <td colspan="2" class="List_ContentCell"> <select class="List_width List_height" name="inpcCostcenterId" size="5" multiple="" id="reportCCostcenterId"></select></td> + </tr> + <tr> + <td class="TitleCell"><span class="LabelText">User1</span></td> ------------------------------------------------------------------------------ Managing the Performance of Cloud-Based Applications Take advantage of what the Cloud has to offer - Avoid Common Pitfalls. Read the Whitepaper. http://pubads.g.doubleclick.net/gampad/clk?id=121051231&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
