details: /erp/devel/pi/rev/bfa7c0726091
changeset: 12448:bfa7c0726091
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Tue May 24 11:47:14 2011 +0200
summary: Fixed bug 16439
Requisition to order process help improved
Create purchase order from requisition help improved
details: /erp/devel/pi/rev/bf3bcb312d03
changeset: 12449:bf3bcb312d03
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Tue May 24 11:51:46 2011 +0200
summary: Backed out changeset f45776302651
Issue 16436 and Issue 16440
We changed it globaly but the change was just needed for Orders
details: /erp/devel/pi/rev/4163cf44c5bf
changeset: 12450:4163cf44c5bf
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Tue May 24 11:52:06 2011 +0200
summary: merge
details: /erp/devel/pi/rev/965b212d21eb
changeset: 12451:965b212d21eb
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Tue May 24 13:36:48 2011 +0200
summary: Fixed bug 16436 and Fixed bug 16440
Renamed status Completed by Booked, and changed the button Complete to Book
for Purchase/Sales Orders
details: /erp/devel/pi/rev/5f4e6ceab433
changeset: 12452:5f4e6ceab433
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Tue May 24 17:35:22 2011 +0200
summary: Issue 16437
Renamed Price Limit element by Net Price Limit
Created new Base Net Limit Price
details: /erp/devel/pi/rev/651f0440ceed
changeset: 12453:651f0440ceed
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Tue May 24 18:12:04 2011 +0200
summary: Issue 16437
Modified Net List Price
Synchronized Base Net Unit Price
details: /erp/devel/pi/rev/d8dcded17d0f
changeset: 12454:d8dcded17d0f
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Wed May 25 09:47:31 2011 +0200
summary: Issue 16437
Updated Net Unit Price elements and fields
details: /erp/devel/pi/rev/d07e8367289c
changeset: 12455:d07e8367289c
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Wed May 25 10:05:23 2011 +0200
summary: Issue 16437
Fixed Net Unit Price
details: /erp/devel/pi/rev/f55ce1f421ba
changeset: 12456:f55ce1f421ba
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Wed May 25 10:17:10 2011 +0200
summary: Issue 16437
Base Net Limit Price
Base Net List Price
details: /erp/devel/pi/rev/59f0d703b416
changeset: 12457:59f0d703b416
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Wed May 25 10:33:55 2011 +0200
summary: Issue 16437
Fixed Net List Price
Fixed Net Price Limit
Max. Net Price Limit Margin
Max. Net List Price Margin
Min. Net List Price Margin
Min. Net Unit Price Margin
Net List Price Discount %
Net List Price Rounding
details: /erp/devel/pi/rev/5158ef78e154
changeset: 12458:5158ef78e154
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Wed May 25 11:02:38 2011 +0200
summary: Issue 16437
Net Price Limit Discount %
Net Price Limit Rounding
Net Price min Margin
Net Unit Price Discount %
Net Unit Price Rounding
Planned PO Net Unit Price
Planned SO Net Unit Price
Surcharge Net List Price Amount
Surcharge Net Price Limit Amount
Surcharge Net Unit Price Amount
details: /erp/devel/pi/rev/dd9a15a674e1
changeset: 12459:dd9a15a674e1
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Wed May 25 11:51:11 2011 +0200
summary: Fixed bug 16437
Product selector changes:
- Price List Price renamed to Net List Price
- Applied Price renamed to Net Unit Price
- Net Unit Price is shown before Net List Price
details: /erp/devel/pi/rev/4d231f752110
changeset: 12460:4d231f752110
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Wed May 25 16:42:10 2011 +0200
summary: Fixed bug 16440 and Fixed bug 16436
Messages related to complete order have been changed by book order
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|
4 +-
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|
8 +-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml
| 7 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-clone-order.js
| 2 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
| 375 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-statusbar.js
| 79 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
| 30
+-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 24 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.css
| 4 +-
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|
2 +-
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|
6 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java
| 68 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 4 +-
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|
2 +-
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|
2 +-
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
| 4
+-
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
|
10 +-
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 12 +-
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
| 4 +-
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js
| 4 +-
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
| 4
+-
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
|
4 +-
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 6 +-
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 6 +-
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 24 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 14 +-
referencedata/sampledata/F_B_International_Group.xml
| 8672 +++++----
referencedata/sampledata/QA_Testing.xml
| 411 +-
src-db/database/sourcedata/AD_COLUMN.xml
| 76 +-
src-db/database/sourcedata/AD_ELEMENT.xml
| 119 +-
src-db/database/sourcedata/AD_FIELD.xml
| 218 +-
src-db/database/sourcedata/AD_MESSAGE.xml
| 18 +-
src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
src-db/database/sourcedata/AD_REFERENCE.xml
| 29 +
src-db/database/sourcedata/AD_REF_LIST.xml
| 357 +-
src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
| 14 +-
58 files changed, 5673 insertions(+), 5026 deletions(-)
diffs (truncated from 33439 to 300 lines):
diff -r 8d337344cc56 -r 4d231f752110
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Wed May 25 16:40:26 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Wed May 25 16:42:10 2011 +0200
@@ -6,7 +6,7 @@
<!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and
Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.12210]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.12445]]></VERSION>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your
finances with an ERP does not have to be difficult. Enjoy a radically improved
user experience that combines the power of an enterprise grade financial
application with the simplicity and ease of a web 2.0 personal accounting
service.]]></DESCRIPTION>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and
Receivables Management simplifies and automates the business processes around
the management of financial accounts, from the receipt and issue of payment, to
the reconciliation of those events with bank statements.
If you would like to help shape this module you are welcome to take part in
the forum discussions or register feature requests or issues in the
corresponding (Forum and Bug Tracking) sections in the Advanced Payables and
Receivable project in the OB Forge.]]></HELP>
@@ -25,7 +25,7 @@
<!--A918E3331C404B889D69AA9BFAFB23AC--> <UPDATEINFO><![CDATA[Fixed issue with
document sequence numbers reset in case of applying dataset second time.
Fixed issue 15305.]]></UPDATEINFO>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <REFERENCEDATAINFO><![CDATA[Document
types and default algorithm for bank statement auto
matching]]></REFERENCEDATAINFO>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION_LABEL><![CDATA[RC7]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--A918E3331C404B889D69AA9BFAFB23AC-->
<ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE>
diff -r 8d337344cc56 -r 4d231f752110
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed May 25 16:40:26 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed May 25 16:42:10 2011 +0200
@@ -7,7 +7,7 @@
<!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.12210]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.12445]]></STARTVERSION>
<!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User
Interface Selector]]></DEPENDANT_MODULE_NAME>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
<!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--B97FC854C6DD41E692161585645A900F-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--B97FC854C6DD41E692161585645A900F-->
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.12210]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.12445]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 8d337344cc56 -r 4d231f752110
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Wed May 25 16:40:26 2011 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Wed May 25 16:42:10 2011 +0200
@@ -6,7 +6,7 @@
<!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.12210]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.12445]]></VERSION>
<!--C70732EA90A14EC0916078B85CC33D2D--> <DESCRIPTION><![CDATA[JBoss
Weld]]></DESCRIPTION>
<!--C70732EA90A14EC0916078B85CC33D2D--> <HELP><![CDATA[Provides the JBoss
Weld framework: Java Contexts and Dependency Injection for the Java EE platform
(CDI). For more information see http://seamframework.org/Weld]]></HELP>
<!--C70732EA90A14EC0916078B85CC33D2D-->
<URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL>
@@ -22,7 +22,7 @@
<!--C70732EA90A14EC0916078B85CC33D2D-->
<ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--C70732EA90A14EC0916078B85CC33D2D-->
<HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
<!--C70732EA90A14EC0916078B85CC33D2D--> <UPDATEINFO><![CDATA[Bug
fixing.]]></UPDATEINFO>
-<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION_LABEL><![CDATA[RC7]]></VERSION_LABEL>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--C70732EA90A14EC0916078B85CC33D2D-->
<ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--C70732EA90A14EC0916078B85CC33D2D--></AD_MODULE>
diff -r 8d337344cc56 -r 4d231f752110
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed May 25 16:40:26 2011 +0200
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed May 25 16:42:10 2011 +0200
@@ -7,7 +7,7 @@
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.12210]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.12445]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 8d337344cc56 -r 4d231f752110
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Wed May 25 16:40:26 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Wed May 25 16:42:10 2011 +0200
@@ -6,7 +6,7 @@
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface
Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.12210]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.12445]]></VERSION>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <DESCRIPTION><![CDATA[Provides the
main application components for the openbravo user interface]]></DESCRIPTION>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <HELP><![CDATA[Provides the main
application components for the openbravo user interface. The main layout
incorporates a navigation bar and a main view area.]]></HELP>
<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL>
@@ -22,7 +22,7 @@
<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <UPDATEINFO><![CDATA[Styling
bugfixing]]></UPDATEINFO>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION_LABEL><![CDATA[RC7]]></VERSION_LABEL>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--9BA0836A3CD74EE4AB48753A47211BCC--></AD_MODULE>
diff -r 8d337344cc56 -r 4d231f752110
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed May 25 16:40:26 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed May 25 16:42:10 2011 +0200
@@ -7,7 +7,7 @@
<!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--15D7CE8D95D043189162DBABA54A1F61-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--15D7CE8D95D043189162DBABA54A1F61-->
<AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.12210]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.12445]]></STARTVERSION>
<!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON
Datasource]]></DEPENDANT_MODULE_NAME>
<!--15D7CE8D95D043189162DBABA54A1F61-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
<!--60A170212F36499D83B8AD38D01F46B3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--60A170212F36499D83B8AD38D01F46B3-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--60A170212F36499D83B8AD38D01F46B3-->
<AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.12210]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.12445]]></STARTVERSION>
<!--60A170212F36499D83B8AD38D01F46B3--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDANT_MODULE_NAME><![CDATA[User
Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
<!--60A170212F36499D83B8AD38D01F46B3-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
<!--824D60CB352E4099B1D8C903CA139DAE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--824D60CB352E4099B1D8C903CA139DAE-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--824D60CB352E4099B1D8C903CA139DAE-->
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.12210]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.12445]]></STARTVERSION>
<!--824D60CB352E4099B1D8C903CA139DAE--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--824D60CB352E4099B1D8C903CA139DAE-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--824D60CB352E4099B1D8C903CA139DAE-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.12210]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.12445]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 8d337344cc56 -r 4d231f752110
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml
Wed May 25 16:40:26 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml
Wed May 25 16:42:10 2011 +0200
@@ -82,7 +82,12 @@
{"id": "StatusBar_Previous", "keyComb": {"alt": true, "shift": true, "key":
"Page_Up"}},
{"id": "StatusBar_Next", "keyComb": {"alt": true, "shift": true, "key":
"Page_Down"}},
{"id": "StatusBar_Maximize-Restore", "keyComb": {"ctrl": true, "alt": true,
"key": "Enter"}},
- {"id": "StatusBar_Close", "keyComb": {"key": "Escape"}}
+ {"id": "StatusBar_Close", "keyComb": {"key": "Escape"}},
+ {"id": "SectionItem_MoreInformation", "keyComb": {"ctrl": true, "shift":
true, "key": "1"}},
+ {"id": "SectionItem_Audit", "keyComb": {"ctrl": true, "shift": true, "key":
"2"}},
+ {"id": "SectionItem_Notes", "keyComb": {"ctrl": true, "shift": true, "key":
"3"}},
+ {"id": "SectionItem_LinkedItems", "keyComb": {"ctrl": true, "shift": true,
"key": "4"}},
+ {"id": "SectionItem_Attachments", "keyComb": {"ctrl": true, "shift": true,
"key": "5"}}
]]]></VALUE>
<!--8EE6D055A7FE4C4DA7EB557F6C61D0ED-->
<PROPERTY><![CDATA[UISTATB_KeyboardShortcuts]]></PROPERTY>
<!--8EE6D055A7FE4C4DA7EB557F6C61D0ED-->
<ISPROPERTYLIST><![CDATA[Y]]></ISPROPERTYLIST>
diff -r 8d337344cc56 -r 4d231f752110
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
Wed May 25 16:40:26 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/layout.js.ftl
Wed May 25 16:42:10 2011 +0200
@@ -54,7 +54,7 @@
OB.Layout = isc.VLayout.create({
width: '100%',
height: '100%',
- overflow: 'auto'
+ overflow: 'hidden'
});
// create the bar with navigation components
diff -r 8d337344cc56 -r 4d231f752110
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-clone-order.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-clone-order.js
Wed May 25 16:40:26 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-clone-order.js
Wed May 25 16:42:10 2011 +0200
@@ -33,6 +33,8 @@
requestParams, function(rpcResponse, data, rpcRequest) {
var recordIndex =
view.viewGrid.getRecordIndex(view.viewGrid.getSelectedRecord()) + 1;
+ // takes care of transforming dates etc.
+ data = view.viewGrid.getDataSource().recordsFromObjects(data)[0];
view.viewGrid.data.insertCacheData(data, recordIndex);
view.viewGrid.scrollToRow(recordIndex);
view.viewGrid.markForRedraw();
diff -r 8d337344cc56 -r 4d231f752110
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Wed May 25 16:40:26 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Wed May 25 16:42:10 2011 +0200
@@ -771,9 +771,228 @@
// == OBDateItem ==
// OBDateItem inherits from SmartClient DateItem
// adds autocomplete and formatting based on the Openbravo date pattern
-isc.ClassFactory.defineClass('OBDateItem', DateItem);
+isc.ClassFactory.defineClass('OBDateItem', isc.DateItem);
-isc.OBDateItem.addClassProperties({
+isc.OBDateItem.addProperties({
+ operator: 'equals',
+ // ** {{{ pickerConstructor }}} **
+ // Picker constructor class
+ pickerConstructor: 'OBDateChooser',
+ useSharedPicker: true,
+
+ // ** {{{ dateFormat }}} **
+ // Dateformat function
+ dateFormat: OB.Format.date,
+
+ // ** {{{ useTextField }}} **
+ // use text field for date entry
+ useTextField: true,
+
+ // ** {{{ changeOnKeypress }}} **
+ // Fire change event on key press.
+ changeOnKeypress: true,
+
+ // is done by the blur event defined here
+ validateOnExit: false,
+ validateOnChange: false,
+
+ textAlign: 'left',
+
+ // to prevent infinite looping as setFormErrors will also blur
+ inBlur: false,
+
+ dateParts : [],
+
+ init: function() {
+ var i, dateFormatUpper, index = 0, currentTime;
+ dateFormatUpper = this.dateFormat.toUpperCase();
+ this.dateSeparator = this.dateFormat.toUpperCase().replace(/D/g, '')
+ .replace(/M/g, '').replace(/Y/g, '').substr(0, 1);
+ for (i = 0; i < dateFormatUpper.length; i++) {
+ if (this.isSeparator(dateFormatUpper, i)) {
+ index++;
+ } else {
+ this.dateParts[index] = dateFormatUpper.charAt(i);
+ }
+ }
+ currentTime = new Date();
+ this.currentMonth = String(currentTime.getMonth() + 1);
+ if (this.currentMonth.length === 1) {
+ this.currentMonth = '0' + this.currentMonth;
+ }
+ this.currentDay = String(currentTime.getDate());
+ if (this.currentDay.length === 1) {
+ this.currentDay = '0' + this.currentDay;
+ }
+ this.currentYear = String(currentTime.getFullYear());
+
+ this.Super('init', arguments);
+ },
+
+ // compare while ignoring milli difference
+ compareValues: function (value1, value2) {
+ // not a date let the super class do it
+ if (!isc.isA.Date(value1) || !isc.isA.Date(value2)) {
+ return this.Super('compareValues', arguments);
+ }
+ var difference = value1.getTime() - value2.getTime();
+ if (difference < -1000) {
+ return true;
+ } else if (difference > 1000) {
+ return false;
+ } else {
+ return true;
+ }
+ },
+
+ // ** {{{ blur }}} **
+ // Called when the focus leaves the field (sets value and validates)
+ blur: function(){
+ var newValue = this.blurValue(), oldValue = this.getValue(), editRow;
+
+ if (oldValue !== newValue) {
+ this.storeValue(OB.Utilities.Date.OBToJS(newValue, this.dateFormat));
+ }
+ if (!this.inBlur) {
+ this.inBlur = true;
+ this.checkOBDateItemValue();
+ this.inBlur = false;
+ }
+ return this.Super('blur', arguments);
+ },
+
+ blurValue: function() {
+ return this.parseValue();
+ },
+
+ parseValue: function() {
+ var i, str = this.getValue(), parts = [ '', '', '' ], partIndex = 0,
result;
+ if (!str || isc.isA.Date(str)) {
+ return str;
+ }
+ for (i = 0; i < str.length; i++) {
+ if (this.isNumber(str, i)) {
+ if (this.reachedLength(parts[partIndex], partIndex)) {
+ partIndex++;
+ }
+ if (partIndex === 3) {
+ break;
+ }
+ parts[partIndex] = parts[partIndex] + str.charAt(i);
+ } else if (this.isSeparator(str, i)) {
+ partIndex++;
+ } else {
+ // invalid date
+ return str;
+ }
+ if (partIndex === 3) {
------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
