details: /erp/devel/main/rev/8dba4df81fbb
changeset: 8782:8dba4df81fbb
user: Sathiyan Sivaprakasam <sathiyan.sivaprakasam <at> openbravo.com>
date: Tue Oct 26 11:53:58 2010 +0530
summary: Fixes Issue 14745: Hide \"Filter By Organization\" field in Document
Definition window
details: /erp/devel/main/rev/0f75f9ed2c72
changeset: 8783:0f75f9ed2c72
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Tue Oct 26 13:06:52 2010 +0530
summary: Fixes Issue 10690: Expense Report and Project Profitability Reports
display hours even if time sheet lines are in days
details: /erp/devel/main/rev/fb8df49a0cc3
changeset: 8784:fb8df49a0cc3
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Tue Oct 26 11:58:14 2010 +0200
summary: Fixes bug 0014825, 0014931
details: /erp/devel/main/rev/b72bd31277e4
changeset: 8785:b72bd31277e4
user: Mohankumar Swaminathan <mohankumar.swaminathan <at> openbravo.com>
date: Tue Oct 26 15:37:24 2010 +0530
summary: Fixes Issue 14240: Commission payment should be Edit Only tab not
read-only tab
details: /erp/devel/main/rev/f293da03873a
changeset: 8786:f293da03873a
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Tue Oct 26 13:09:37 2010 +0200
summary: [usageAudit] Make bigger command column.
details: /erp/devel/main/rev/3bd074923746
changeset: 8787:3bd074923746
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Tue Oct 26 16:08:08 2010 +0200
summary: Fixes issue 0015035: Not able to create Goods receipt, for a order
which is created with -ve quantity using create line from button in Good receipt
It has been removed the check of delivered items for negative quantities for
the query that selects candidate lines for shipment
details: /erp/devel/main/rev/21ce76219421
changeset: 8788:21ce76219421
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Tue Oct 26 16:24:46 2010 +0200
summary: Fixes Issue 10690: Expense Report and Project Profitability Reports
display hours even if time sheet lines are in days
Fixed typo
details: /erp/devel/main/rev/25db9e74a308
changeset: 8789:25db9e74a308
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Tue Oct 26 17:09:28 2010 +0200
summary: Fixes issue 0015035: Not able to create Goods receipt, for a order
which is created with -ve quantity using create line from button in Good receipt
It has been removed the check of delivered items for negative quantities for
the query that selects candidate lines for shipment
details: /erp/devel/main/rev/9552060636a3
changeset: 8790:9552060636a3
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Tue Oct 26 19:40:23 2010 +0200
summary: Fixed issue 15041.Added link as text.
details: /erp/devel/main/rev/d9766e1a501d
changeset: 8791:d9766e1a501d
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Oct 26 21:24:11 2010 +0200
summary: Fixes issue 15043: In-memory columnid not set in case of id property
which is foreign key
details: /erp/devel/main/rev/080b4b811fa9
changeset: 8792:080b4b811fa9
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Tue Oct 26 21:24:16 2010 +0200
summary: Fixes issue 15042. ICS modified
initial client setup modified so now, in case a reference data is not correctly
imported, the error text is directly shown
details: /erp/devel/main/rev/85e337e45594
changeset: 8793:85e337e45594
user: Ratnakaram Suresh <ratnakaram.suresh <at> openbravo.com>
date: Wed Oct 27 10:24:42 2010 +0530
summary: Fixes issue 0014852: Error in report Invoiced Sales Order Report
details: /erp/devel/main/rev/76f2c114d795
changeset: 8794:76f2c114d795
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Oct 27 11:52:55 2010 +0200
summary: Fixed issue 15024.Usage audit is stored on System client and *
Organization.
details: /erp/devel/main/rev/e7412260acf2
changeset: 8795:e7412260acf2
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Oct 27 11:59:20 2010 +0200
summary: Fixed issue 15020.Added left padding to text.
details: /erp/devel/main/rev/42f4be6cf1f8
changeset: 8796:42f4be6cf1f8
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Oct 27 12:22:53 2010 +0200
summary: Fixed issue 15026.Use document.location.protocol on community
branding requests to butler.
details: /erp/devel/main/rev/f7317da0ee23
changeset: 8797:f7317da0ee23
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Oct 27 12:30:34 2010 +0200
summary: Fixed issue 15029.Changed to log4j.info in case there is not
internet available.
details: /erp/devel/main/rev/741372ebe339
changeset: 8798:741372ebe339
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Oct 27 13:07:25 2010 +0200
summary: [communityBranding] Added right padding to static content.
details: /erp/devel/main/rev/4e251a8ddac6
changeset: 8799:4e251a8ddac6
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Wed Oct 27 17:22:50 2010 +0530
summary: Fixes Issue 14889: Organization filter does not work properly in
general ledger report
details: /erp/devel/main/rev/5284d19837e1
changeset: 8800:5284d19837e1
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Wed Oct 27 17:47:51 2010 +0530
summary: Fixes issue 14850: An error message in the Sales Invoice Dimensional
Report is not clear
As It doesn't make sense to execute Dimensional report without selecting any
dimension, Validation has been added in order to not allow empty dimension list.
details: /erp/devel/main/rev/75738e794fde
changeset: 8801:75738e794fde
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Oct 27 14:44:39 2010 +0200
summary: Fixed issue 15048.Purpose is set on System Info if it is null and it
is an active instance.
details: /erp/devel/main/rev/e2051a70d36f
changeset: 8802:e2051a70d36f
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Wed Oct 27 15:37:03 2010 +0200
summary: Issue 15048: Fix display of purpose when upgrading activated
instance to MP23
If instance purpose is not set, but the instance is activated read the purpose
from the license and display this (more correct purpose).
details: /erp/devel/main/rev/6592d59a0205
changeset: 8803:6592d59a0205
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Wed Oct 27 17:54:27 2010 +0200
summary: Fixes issue 14929: If no storage records for product treat as zero
stock
Alter the sql for the products under stock alert to treat no stock records as
equivalent to zero stock (instead of null)
On behalf of Ben Sommerville
details: /erp/devel/main/rev/438617827527
changeset: 8804:438617827527
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Oct 27 21:23:12 2010 +0200
summary: Fixes issue 15050: OBQuery: whereclause with alias with a comma
direct after the alias fails
Fixes issue 15056: OBQuery: whereclause with alias with a comma direct after
the alias fails
details: /erp/devel/main/rev/09983f27135a
changeset: 8805:09983f27135a
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Oct 28 10:18:10 2010 +0200
summary: [heatbeat] Add Rejected logins due to concurrent users parameter.
details: /erp/devel/main/rev/756333addf28
changeset: 8806:756333addf28
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Thu Oct 28 09:20:01 2010 +0200
summary: Fixed bug 14945: Amount From field in Create Lines from Bank
Statement is not translated
Removed blank space to allow translation engine to translate this string
details: /erp/devel/main/rev/c5e9de5472b5
changeset: 8807:c5e9de5472b5
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Thu Oct 28 17:56:55 2010 +0530
summary: Fixes issue 14315: Creation of good shipments fails if the product
search key has 32 characters
A_ASSET_CREATE is modified in order to truncate asset value to 40 chars before
to insert. Hence, it's working fine as expected.
details: /erp/devel/main/rev/a96c8afc5426
changeset: 8808:a96c8afc5426
user: Balamurugan Ramadoss <balamurugan.ramadoss <at> openbravo.com>
date: Thu Oct 28 18:02:02 2010 +0530
summary: Fixes Issue 14866: Check Used for Record ID in Document Sequence
details: /erp/devel/main/rev/3a1e20b709fe
changeset: 8809:3a1e20b709fe
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Oct 28 15:36:33 2010 +0200
summary: Fixes issue 14914: Error related to views in DAL: cannot modify a
column which maps to a non key-preserved table
details: /erp/devel/main/rev/395eb5e04f70
changeset: 8810:395eb5e04f70
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Oct 28 16:03:36 2010 +0200
summary: Fixed issue 15055. Force reload of purpose image or system info
window using 2.50 ui.
details: /erp/devel/main/rev/0a0fb2432e0d
changeset: 8811:0a0fb2432e0d
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Oct 28 16:38:06 2010 +0200
summary: Related to issue 14914: Error related to views in DAL: cannot modify
a column which maps to a non key-preserved table
details: /erp/devel/main/rev/d1887f7014d1
changeset: 8812:d1887f7014d1
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Oct 28 16:42:41 2010 +0200
summary: Related to issue 15061.Give more space to the drop down on the
instance purpose popup.
details: /erp/devel/main/rev/831da14a213c
changeset: 8813:831da14a213c
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Oct 28 17:11:20 2010 +0200
summary: Related to issue 15061.Set 'you must select a purpose' in red bold
and fix typo.
details: /erp/devel/main/rev/e9f6aa14b3d8
changeset: 8814:e9f6aa14b3d8
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Oct 28 18:06:31 2010 +0200
summary: Related to issue 15061.Replace the learn more url's by real links
details: /erp/devel/main/rev/b11a9e29d336
changeset: 8815:b11a9e29d336
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Oct 28 18:40:22 2010 +0200
summary: Fixed issue 15061.Add a tooltip on case the purpose is not set.
details: /erp/devel/main/rev/a71bc77a4fc9
changeset: 8816:a71bc77a4fc9
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Fri Oct 29 09:22:41 2010 +0200
summary: Related to issue 15046.Optimization and fix typo.
details: /erp/devel/main/rev/28cb24e774cc
changeset: 8817:28cb24e774cc
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Fri Oct 29 23:05:42 2010 +0200
summary: Adapted some popups to be able to open them as MDI popups:
- Instance Purpose
- Heartbeat
- Registration
- MMC related popups (browse file system, module info, rebuild popup, show
log, ...)
- Help
- Help edit
- About
details: /erp/devel/main/rev/3835fb615788
changeset: 8818:3835fb615788
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Nov 01 15:27:53 2010 +0100
summary: Fixes issue 15081 You cannot update from RC2 to the latest MP
details: /erp/devel/main/rev/bf66146febf2
changeset: 8819:bf66146febf2
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Nov 01 21:39:01 2010 +0100
summary: Set 2 hqlwhereclause entries
details: /erp/devel/main/rev/4074a0b81f8f
changeset: 8820:4074a0b81f8f
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Nov 01 21:58:17 2010 +0100
summary: Added hqlorderbyclause example
details: /erp/devel/main/rev/24ab55aa65e7
changeset: 8821:24ab55aa65e7
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Tue Nov 02 13:49:52 2010 +0530
summary: Fixes issue 14893: accounting selector does not work fine, when
there is several accounting schemas
OnLoadFunction has been modified in order to resolve the issue.
No impacts.
details: /erp/devel/main/rev/8305c6c692b8
changeset: 8822:8305c6c692b8
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Nov 02 09:55:56 2010 +0100
summary: Improved online help of export allowed column in the dataset table
details: /erp/devel/main/rev/e4676aaa7be3
changeset: 8823:e4676aaa7be3
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Tue Nov 02 15:50:38 2010 +0100
summary: Fixed smoke-test build while showing 'refresh cache' alert
details: /erp/devel/main/rev/87e52d35324f
changeset: 8824:87e52d35324f
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Tue Nov 02 17:53:24 2010 +0100
summary: Added more security in some 'if' statemets to avoid js error in
strange situations
details: /erp/devel/main/rev/6fbfcf8888d6
changeset: 8825:6fbfcf8888d6
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Tue Nov 02 18:08:06 2010 +0100
summary: Fixes issue 0015008: Wrong behaviour with 9 Decimals
It has been modified the TO_NUMBER function to accept up to 10 decimals instead
of 6 decimals
details: /erp/devel/main/rev/45d3fff6f38d
changeset: 8826:45d3fff6f38d
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Tue Nov 02 18:57:43 2010 +0100
summary: Update local copy of community branding pages with latest layout
changes
from the online version in butler
details: /erp/devel/main/rev/2e1ceb2f6523
changeset: 8827:2e1ceb2f6523
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Wed Nov 03 11:30:09 2010 +0100
summary: Fix typos in the comments explaining the different parameter values
details: /erp/devel/main/rev/3b9f9beef98a
changeset: 8828:3b9f9beef98a
user: Ioritz Cia <ioritz.cia <at> openbravo.com>
date: Wed Nov 03 09:13:59 2010 +0100
summary: Fixes issue 0014577: The image printed in the printable templates is
taken from the right place.
details: /erp/devel/main/rev/12a89786d7c7
changeset: 8829:12a89786d7c7
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Nov 03 18:41:14 2010 +0100
summary: Added title to new MDI popups
details: /erp/devel/main/rev/5fc875b9ab51
changeset: 8830:5fc875b9ab51
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Wed Nov 03 18:11:37 2010 +0100
summary: Fixes issue 0014947: Clean System Admin Role from the entities
(Windows, Reports and so on) it should not have access to
It has been changed the Access Level of all reports and processes that appear
at System level
details: /erp/devel/main/rev/17af005199ad
changeset: 8831:17af005199ad
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Thu Nov 04 09:26:01 2010 +0100
summary: merge
details: /erp/devel/main/rev/64907b1ed4c4
changeset: 8832:64907b1ed4c4
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Nov 04 10:22:03 2010 +0100
summary: fixed issue 15093: Include instance number in beats
Professional instances will send the instance numbere related to their license
details: /erp/devel/main/rev/6528f3ffeb0a
changeset: 8833:6528f3ffeb0a
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Thu Nov 04 13:13:59 2010 +0100
summary: Improved performance of getFrame('LayoutMDI')
details: /erp/devel/main/rev/3ad12ab37ec5
changeset: 8834:3ad12ab37ec5
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Thu Nov 04 14:04:09 2010 +0100
summary: Export Initial Setup dataset in MP23.
Name attribute order has changed in DocumentTemplate entity, now it is in third
position.
3 new columns in DocumentTemplate entity: showlogo, showcompanydata and
headermargin
details: /erp/devel/main/rev/c7d985e43280
changeset: 8835:c7d985e43280
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Nov 04 17:21:24 2010 +0100
summary: fixed bug 15115: Disabling heartbeat is not working under some
circunstances in 3.0 RC2
Log saved in process run is truncted to 4000 characters
details: /erp/devel/main/rev/1528be065b3b
changeset: 8836:1528be065b3b
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Thu Nov 04 19:23:56 2010 +0100
summary: Fixes issue 0015039: Wrong message in Service Project when you
select new Price List
SE_ProjectLine callout was mistakenly applying parameters it was intrepreting a
pricelistversion_id as a pricelist_id
Now the callout is interpreting properly arguments
details: /erp/devel/main/rev/f2cf138fa03c
changeset: 8837:f2cf138fa03c
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Nov 05 11:44:01 2010 +0000
summary: CI: promote changesets from pi to main
diffstat:
.hgsigs
| 1 +
.hgtags
| 1 +
build.xml
| 2 +-
config/Openbravo.properties.template
| 6 +-
referencedata/standard/Initial_Setup.xml
| 82 ++-
src-db/database/model/functions/A_ASSET_CREATE.xml
| 4 +-
src-db/database/model/prescript-PostgreSql.sql
| 4 +-
src-db/database/model/tables/AD_HEARTBEAT_LOG.xml
| 8 +
src-db/database/model/tables/AD_SESSION_USAGE_AUDIT.xml
| 2 +-
src-db/database/sourcedata/AD_COLUMN.xml
| 70 ++-
src-db/database/sourcedata/AD_ELEMENT.xml
| 27 +-
src-db/database/sourcedata/AD_FIELD.xml
| 124 +++-
src-db/database/sourcedata/AD_MESSAGE.xml
| 28 +-
src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
src-db/database/sourcedata/AD_PROCESS.xml
| 42 +-
src-db/database/sourcedata/AD_TAB.xml
| 6 +
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
| 22 +-
src-db/database/sourcedata/referencedData/AD_ALERTRULE.xml
| 8 +-
src-test/org/openbravo/test/dal/IssuesTest.java
| 14 +
src-test/org/openbravo/test/dal/ViewTest.java
| 24 +
src/org/openbravo/base/model/ModelProvider.java
| 1 +
src/org/openbravo/base/secureApp/AdvisePopUpRefresh.html
| 15 +-
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java
| 4 +
src/org/openbravo/dal/core/DalMappingGenerator.java
| 25 +-
src/org/openbravo/dal/core/DalUtil.java
| 2 +-
src/org/openbravo/dal/service/OBQuery.java
| 3 +
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Bank.html
| 4 +-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql
| 4 +-
src/org/openbravo/erpCommon/ad_callouts/SE_ProjectLine_Value.java
| 31 +-
src/org/openbravo/erpCommon/ad_forms/DocInvoice.java
| 16 +-
src/org/openbravo/erpCommon/ad_forms/Heartbeat.html
| 12 +-
src/org/openbravo/erpCommon/ad_forms/Heartbeat.java
| 3 +-
src/org/openbravo/erpCommon/ad_forms/InstancePurpose.html
| 51 +-
src/org/openbravo/erpCommon/ad_forms/InstancePurpose.java
| 3 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
| 4 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementAdd.html
| 10 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementDetails.html
| 9 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementInstalled.html
| 2 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html
| 9 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallLocal.html
| 7 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP1.html
| 12 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP2.html
| 7 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagement_InstallP4.html
| 7 +-
src/org/openbravo/erpCommon/ad_forms/Registration.html
| 12 +-
src/org/openbravo/erpCommon/ad_forms/ShowLogFile.html
| 7 +
src/org/openbravo/erpCommon/ad_help/DisplayHelp.html
| 8 +-
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Element_F1.html
| 5 +-
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Element_F2.html
| 2 +-
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_F1.html
| 5 +-
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_F2.html
| 6 +-
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Field_F1.html
| 5 +-
src/org/openbravo/erpCommon/ad_help/DisplayHelp_Edit_Field_F2.html
| 6 +-
src/org/openbravo/erpCommon/ad_process/ApplyModules.html
| 26 +-
src/org/openbravo/erpCommon/ad_process/HeartbeatProcess.java
| 38 +-
src/org/openbravo/erpCommon/ad_process/HeartbeatRedirect.html
| 12 +-
src/org/openbravo/erpCommon/ad_reports/ReportExpense.java
| 35 +-
src/org/openbravo/erpCommon/ad_reports/ReportExpense_data.xsql
| 20 +-
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.html
| 12 +-
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html
| 5 +
src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesFilterJR.html
| 5 +
src/org/openbravo/erpCommon/ad_reports/ReportMaterialDimensionalAnalysesFilterJR.html
| 5 +
src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitabilityJR.java
| 8 +
src/org/openbravo/erpCommon/ad_reports/ReportProjectProfitability_data.xsql
| 23 +-
src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesFilterJR.html
| 5 +
src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalysesFilter.html
| 5 +
src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJRFilter.html
| 5 +
src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderInvoiced_data.xsql
| 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJRFilter.html
| 5 +
src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java
| 4 +
src/org/openbravo/erpCommon/modules/ApplyModuleTask.java
| 19 +
src/org/openbravo/erpCommon/security/Login_F1.html
| 4 +-
src/org/openbravo/erpCommon/utility/Home.html
| 27 +-
src/org/openbravo/erpCommon/utility/Home.java
| 21 +-
src/org/openbravo/erpCommon/utility/Home.xml
| 2 +
src/org/openbravo/erpCommon/utility/HttpsUtils.java
| 2 +-
src/org/openbravo/erpCommon/utility/SystemInfo.java
| 38 +-
src/org/openbravo/erpCommon/utility/Utility.java
| 16 +
src/org/openbravo/erpCommon/utility/VerticalMenu.html
| 2 +-
src/org/openbravo/erpReports/C_OrderJR.jrxml
| 2 +-
src/org/openbravo/erpReports/RptC_Invoice.jrxml
| 2 +-
src/org/openbravo/erpReports/RptC_OrderPO.jrxml
| 2 +-
src/org/openbravo/erpReports/RptM_InOut.jrxml
| 2 +-
src/org/openbravo/scheduling/ProcessRunner.java
| 9 +-
web/html/en_US/StaticCommunityBranding-2.50-Basic.html
| 8 +-
web/html/en_US/StaticCommunityBranding-2.50-Comm.html
| 4 +-
web/html/en_US/StaticCommunityBranding-2.50-STD.html
| 14 +-
web/js/messages.js
| 8 +-
web/js/shortcuts.js
| 2 +-
web/js/utils.js
| 233 +++++++--
89 files changed, 1037 insertions(+), 371 deletions(-)
diffs (truncated from 3697 to 300 lines):
diff -r 4078dd205e65 -r f2cf138fa03c .hgsigs
--- a/.hgsigs Mon Oct 25 15:29:08 2010 +0200
+++ b/.hgsigs Fri Nov 05 11:44:01 2010 +0000
@@ -23,3 +23,4 @@
618363224a381737439e0bd4461e2d36c4fd986e 0
iEYEABECAAYFAkxFkHoACgkQCX/oGf+2qkP7DQCeK9qCv3jETpO5iM89PV2bJYmpErMAoO/H2QyeKKZjublcgFmH7g1tEomB
6563372bc2fbf0bc2e15f70c2a8da81fad8cbc2e 0
iEYEABECAAYFAkyDw4sACgkQCX/oGf+2qkMZ1ACePoFeipRkNAN6bW7yIUeiRYgEMBMAni+gFwpEp8kfGKryvixvdudRgGoQ
b033dcbeeabc1db396798b8e5cbe196522f43a53 0
iEYEABECAAYFAkydFwMACgkQCX/oGf+2qkM1NwCbBJjgs9qM221q415Ygu/EVvhE31sAn2+O6DOYQNbM3xFuCnhhtuDQWDa/
+323d74d7ad1c7a2c4e92b6cfbc08f8ef406315f9 0
iEYEABECAAYFAkzTE3gACgkQCX/oGf+2qkPsRQCeMcvruESd9p1/uezSdZNtrlZS5UYAoMIolxQ5ig1o5yOB2Xxgvm5R9Jel
diff -r 4078dd205e65 -r f2cf138fa03c .hgtags
--- a/.hgtags Mon Oct 25 15:29:08 2010 +0200
+++ b/.hgtags Fri Nov 05 11:44:01 2010 +0000
@@ -33,3 +33,4 @@
99ff33f6588973f7e738b6afd47ad44f3ac08d20 2.50MP20
a3c1cffa8af7b60cab6949251fce1faaa13ca5bb 2.50MP21
8ede6ac265f1dd70536888ce3e20ffd54e3a3bc6 2.50MP22
+974f18d14979e367da4ea591def9d1da816159ff 2.50MP23
diff -r 4078dd205e65 -r f2cf138fa03c build.xml
--- a/build.xml Mon Oct 25 15:29:08 2010 +0200
+++ b/build.xml Fri Nov 05 11:44:01 2010 +0000
@@ -766,7 +766,7 @@
-->
<target name="apply.module" depends="compile.apply.module">
<java classname="org.openbravo.erpCommon.modules.ApplyModuleTask"
fork="true" maxmemory="${build.maxmemory}" failonerror="true">
- <arg line="'${base.src}'" />
+ <arg line="'${base.src}' '${friendlyWarnings}'" />
<classpath refid="apply.module.runtime.classpath" />
</java>
<delete includeEmptyDirs="true" dir="${build.apply.module}" />
diff -r 4078dd205e65 -r f2cf138fa03c config/Openbravo.properties.template
--- a/config/Openbravo.properties.template Mon Oct 25 15:29:08 2010 +0200
+++ b/config/Openbravo.properties.template Fri Nov 05 11:44:01 2010 +0000
@@ -111,7 +111,7 @@
# Authentication #
##################
-# Leave this empty to use the default login hardler.
+# Leave this empty to use the default login handler.
# LAM server example: org.openbravo.authentication.lam.LamAuthenticationManager
authentication.class=
@@ -170,8 +170,8 @@
# Log in security #
###################
-# If these properties are set, after log in trail failed the response time
-# will be delayed, and the user can be blocked.
+# If these properties are set, after a failed login the response time
+# will be delayed, and the user account can be blocked.
login.trial.delay.increment=0
login.trial.delay.max=0
login.trial.user.lock=0
diff -r 4078dd205e65 -r f2cf138fa03c referencedata/standard/Initial_Setup.xml
--- a/referencedata/standard/Initial_Setup.xml Mon Oct 25 15:29:08 2010 +0200
+++ b/referencedata/standard/Initial_Setup.xml Fri Nov 05 11:44:01 2010 +0000
@@ -548,7 +548,7 @@
<salesTransaction>true</salesTransaction>
<sOSubType>WR</sOSubType>
<documentTypeForShipment id="F8CC92C7234644DEAD9F63174F45B2BF"
entity-name="DocumentType" identifier="MM Shipment Indirect"/>
- <documentTypeForInvoice id="40EE9B1CD3B345FABEFDA62B407B407F"
entity-name="DocumentType" identifier="AR Invoice Indirect"/>
+ <documentTypeForInvoice id="40EE9B1CD3B345FABEFDA62B407B407F"
entity-name="DocumentType" identifier="AR Invoice"/>
<sequencedDocument>true</sequencedDocument>
<documentSequence id="FFB42B38D6A34634B534AB499B13644C"
entity-name="ADSequence" identifier="POS Order"/>
<gLCategory id="745A2B441A2644DF934D1B1E462292E9"
entity-name="FinancialMgmtGLCategory" identifier="None"/>
@@ -1449,147 +1449,195 @@
<restartSequenceEveryYear>false</restartSequenceEveryYear>
</ADSequence>
<DocumentTemplate id="02376C41DA824413A9BE649443924C03" identifier="Purchase
Order Report template">
- <name>Purchase Order Report template</name>
<id>02376C41DA824413A9BE649443924C03</id>
<active>true</active>
<documentType id="808F8818F724497D94282AC83493F394"
entity-name="DocumentType" identifier="Purchase Order"/>
+ <name>Purchase Order Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Purchase ord...@our_ref@</reportFilename>
<templateFilename>RptC_OrderPO.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="11DD7B13EAC94215B6F8F735BBED4D55"
identifier="Quotation Report template">
- <name>Quotation Report template</name>
<id>11DD7B13EAC94215B6F8F735BBED4D55</id>
<active>true</active>
<documentType id="0A1D4A2DB7144D81A821E31A9B332ACB"
entity-name="DocumentType" identifier="Quotation"/>
+ <name>Quotation Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Sales ord...@our_ref@</reportFilename>
<templateFilename>C_OrderJR.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="4F23CD7CD64D468EA4753C0C7B09FD53" identifier="Return
Material Report template">
- <name>Return Material Report template</name>
<id>4F23CD7CD64D468EA4753C0C7B09FD53</id>
<active>true</active>
<documentType id="2D7C15F0F44E4F289A729415EFD700C1"
entity-name="DocumentType" identifier="Return Material"/>
+ <name>Return Material Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Sales ord...@our_ref@</reportFilename>
<templateFilename>C_OrderJR.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="70AEA0C77DB743A4A89058BFE091FEEA" identifier="Standard
order report template">
- <name>Standard order report template</name>
<id>70AEA0C77DB743A4A89058BFE091FEEA</id>
<active>true</active>
<documentType id="CB6EEA256BBC41109911215C5A14D39B"
entity-name="DocumentType" identifier="Standard Order"/>
+ <name>Standard order report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>standardord...@our_ref@</reportFilename>
<templateFilename>C_OrderJR.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="9FB97CCA66EA49F29A0EF5080E2AFF29" identifier="AR
Credit Memo Report template">
- <name>AR Credit Memo Report template</name>
<id>9FB97CCA66EA49F29A0EF5080E2AFF29</id>
<active>true</active>
<documentType id="B476CFAE109047DEB5BC9AC80A03297A"
entity-name="DocumentType" identifier="AR Credit Memo"/>
+ <name>AR Credit Memo Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Sales invoi...@our_ref@</reportFilename>
<templateFilename>RptC_Invoice.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="A16BD46A069F4502BDDFD9A555AEAA48" identifier="AR
Invoice Report template">
- <name>AR Invoice Report template</name>
<id>A16BD46A069F4502BDDFD9A555AEAA48</id>
<active>true</active>
<documentType id="40EE9B1CD3B345FABEFDA62B407B407F"
entity-name="DocumentType" identifier="AR Invoice"/>
+ <name>AR Invoice Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Sales invoi...@our_ref@</reportFilename>
<templateFilename>RptC_Invoice.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="A76CE6794C2E467394C21675524DBA9C" identifier="Proposal
Report template">
- <name>Proposal Report template</name>
<id>A76CE6794C2E467394C21675524DBA9C</id>
<active>true</active>
<documentType id="15C8DCE82DA841968ABCD614FED68576"
entity-name="DocumentType" identifier="Proposal"/>
+ <name>Proposal Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Sales ord...@our_ref@</reportFilename>
<templateFilename>C_OrderJR.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="AF10A903167240F883C7EE7A3325981D" identifier="POS
Order Report template">
- <name>POS Order Report template</name>
<id>AF10A903167240F883C7EE7A3325981D</id>
<active>true</active>
<documentType id="511A9371A0F74195AA3F6D66C722729D"
entity-name="DocumentType" identifier="POS Order"/>
+ <name>POS Order Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Sales ord...@our_ref@</reportFilename>
<templateFilename>C_OrderJR.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="B1DF02E45C4946C7BB1D45C065C49577" identifier="AP
Credit Report template">
- <name>AP Credit Report template</name>
<id>B1DF02E45C4946C7BB1D45C065C49577</id>
<active>true</active>
<documentType id="42B7DE94BC324C3F9CC0934375E90FFF"
entity-name="DocumentType" identifier="AP CreditMemo"/>
+ <name>AP Credit Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Purchase invoi...@our_ref@</reportFilename>
<templateFilename>RptC_Invoice.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="B94A012B25FB4C319804BED013BD584B" identifier="Prepay
Order Report template">
- <name>Prepay Order Report template</name>
<id>B94A012B25FB4C319804BED013BD584B</id>
<active>true</active>
<documentType id="15F495A6290040F194A9AA4622FE0C01"
entity-name="DocumentType" identifier="Prepay Order"/>
+ <name>Prepay Order Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Sales ord...@our_ref@</reportFilename>
<templateFilename>C_OrderJR.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="BC7220FEA2F44F9C9FB6619FC58B6944" identifier="MM
Receipt Report template">
- <name>MM Receipt Report template</name>
<id>BC7220FEA2F44F9C9FB6619FC58B6944</id>
<active>true</active>
<documentType id="2030AD7DD4284E2B936E261662EF735A"
entity-name="DocumentType" identifier="MM Receipt"/>
+ <name>MM Receipt Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Goods recei...@our_ref@</reportFilename>
<templateFilename>RptM_InOut.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="C6A6AF1CA3C94B3899CAEC27EE427402" identifier="MM
Shipment Report template">
- <name>MM Shipment Report template</name>
<id>C6A6AF1CA3C94B3899CAEC27EE427402</id>
<active>true</active>
<documentType id="0CD50184705A42CCBECA4EC967646440"
entity-name="DocumentType" identifier="MM Shipment"/>
+ <name>MM Shipment Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Goods shipme...@our_ref@</reportFilename>
<templateFilename>RptM_InOut.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="C76E1DE89DA04BF6B6FAEDDA0216EE7A"
identifier="Warehouse Order Memo Report template">
- <name>Warehouse Order Memo Report template</name>
<id>C76E1DE89DA04BF6B6FAEDDA0216EE7A</id>
<active>true</active>
<documentType id="76E7C671FCE34556908E563F825C2937"
entity-name="DocumentType" identifier="Warehouse Order"/>
+ <name>Warehouse Order Memo Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Sales ord...@our_ref@</reportFilename>
<templateFilename>C_OrderJR.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="D9BB431F120746C8A84266CA42D02029" identifier="On
Credit Order Report template">
- <name>On Credit Order Report template</name>
<id>D9BB431F120746C8A84266CA42D02029</id>
<active>true</active>
<documentType id="E7F4802D902A42A59143DCCBEDE4DE85"
entity-name="DocumentType" identifier="Credit Order"/>
+ <name>On Credit Order Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Sales ord...@our_ref@</reportFilename>
<templateFilename>C_OrderJR.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="E5901A1122F641089417A08A7317764C" identifier="AP
Invoice Report template">
- <name>AP Invoice Report template</name>
<id>E5901A1122F641089417A08A7317764C</id>
<active>true</active>
<documentType id="5C6E02993E9B4FCA81C07955EF676C62"
entity-name="DocumentType" identifier="AP Invoice"/>
+ <name>AP Invoice Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>invoi...@our_ref@</reportFilename>
<templateFilename>RptC_Invoice.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
<DocumentTemplate id="E87E9B580A024383B2E79BD768288899" identifier="MM
Shipment Indirect Report template">
- <name>MM Shipment Indirect Report template</name>
<id>E87E9B580A024383B2E79BD768288899</id>
<active>true</active>
<documentType id="F8CC92C7234644DEAD9F63174F45B2BF"
entity-name="DocumentType" identifier="MM Shipment Indirect"/>
+ <name>MM Shipment Indirect Report template</name>
<templateLocation>@basedesign@/org/openbravo/erpReports</templateLocation>
<reportFilename>Goods shipme...@our_ref@</reportFilename>
<templateFilename>RptM_InOut.jrxml</templateFilename>
+ <showcompanydata>true</showcompanydata>
+ <showlogo>true</showlogo>
+ <headermargin xsi:nil="true"/>
</DocumentTemplate>
</ob:Openbravo>
diff -r 4078dd205e65 -r f2cf138fa03c
src-db/database/model/functions/A_ASSET_CREATE.xml
--- a/src-db/database/model/functions/A_ASSET_CREATE.xml Mon Oct 25
15:29:08 2010 +0200
+++ b/src-db/database/model/functions/A_ASSET_CREATE.xml Fri Nov 05
11:44:01 2010 +0000
@@ -54,6 +54,7 @@
v_Value VARCHAR2(60) ;
v_Name VARCHAR2(80) ;
v_count NUMBER:=0;
+ v_Asset_Value VARCHAR2(200) ;
BEGIN
-- Update AD_PInstance
IF(p_PInstance_ID IS NOT NULL) THEN
@@ -110,6 +111,7 @@
END IF;
v_Value:='_' || Cur_Shipline.Value || v_DocumentNo;
v_Name:='_' || Cur_Shipline.Name || v_DocumentNo;
+ v_Asset_Value:=SUBSTR(Cur_Shipline.BP_Value, 1, 40-LENGTH(v_Value))
|| v_Value;
--
INSERT
INTO A_Asset
@@ -120,7 +122,7 @@
LocationComment, C_BPartner_ID, C_BPartner_Location_ID,
AD_User_ID
)
VALUES
- (v_A_Asset_ID, Cur_Shipline.AD_Client_ID, Cur_Shipline.AD_Org_ID,
'Y', now(), '0', now(), '0', SUBSTR(Cur_Shipline.BP_Value, 1,
40-LENGTH(v_Value)) || v_Value, SUBSTR(Cur_Shipline.BP_Name, 1,
+ (v_A_Asset_ID, Cur_Shipline.AD_Client_ID, Cur_Shipline.AD_Org_ID,
'Y', now(), '0', now(), '0', SUBSTR(v_Asset_Value,1,40),
SUBSTR(Cur_Shipline.BP_Name, 1,
------------------------------------------------------------------------------
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book "Blueprint to a
Billion" shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
