Re: svn commit: r940249 - in /ofbiz/branches/release10.04: ./ applications/order/script/org/
Locked
Re: svn commit: r940249 - in /ofbiz/branches/release10.04: ./ applications/order/script/org/
 
|
We don't really need that mergeinfo stuff do we?
The actual diff looks like a needle in a haystack. Regards Scott On 3/05/2010, at 3:54 AM, [hidden email] wrote: > Author: jleroux > Date: Sun May 2 15:54:05 2010 > New Revision: 940249 > > URL: http://svn.apache.org/viewvc?rev=940249&view=rev > Log: > "Applied fix from trunk for revision: 940248" > ------------------------------------------------------------------------ > r940248 | jleroux | 2010-05-02 17:48:53 +0200 (dim. 02 mai 2010) | 1 ligne > > Temporary workaround to fix an issue in the lookup in lookup Example > ------------------------------------------------------------------------ > > > Modified: > ofbiz/branches/release10.04/ (props changed) > ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) > ofbiz/branches/release10.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) > ofbiz/branches/release10.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) > ofbiz/branches/release10.04/framework/common/widget/HelpScreens.xml (props changed) > ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupForms.xml > ofbiz/branches/release10.04/specialpurpose/ebaystore/lib/ (props changed) > ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) > ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) > ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) > > Propchange: ofbiz/branches/release10.04/ > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Sun May 2 15:54:05 2010 > @@ -1,3 +1,3 @@ > /ofbiz/branches/addbirt:831210-885099,885686-886087 > /ofbiz/branches/multitenant20100310:921280-927264 > -/ofbiz/trunk:939988,939990,939999,940025,940234 > +/ofbiz/trunk:939988,939990,939999,940025,940234,940248 > > Propchange: ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Sun May 2 15:54:05 2010 > @@ -1,3 +1,3 @@ > /ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087 > /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264 > -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:939988,939990,939999,940025,940234 > +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:939988,939990,939999,940025,940234,940248 > > Propchange: ofbiz/branches/release10.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Sun May 2 15:54:05 2010 > @@ -1,3 +1,3 @@ > /incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456 > /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264 > -/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:939988,939990,939999,940025,940234 > +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:939988,939990,939999,940025,940234,940248 > > Propchange: ofbiz/branches/release10.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Sun May 2 15:54:05 2010 > @@ -1,3 +1,3 @@ > /ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087 > /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264 > -/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:939988,939990,939999,940025,940234 > +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:939988,939990,939999,940025,940234,940248 > > Propchange: ofbiz/branches/release10.04/framework/common/widget/HelpScreens.xml > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Sun May 2 15:54:05 2010 > @@ -1,3 +1,3 @@ > /ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087 > /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 > -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:939988,939990,939999,940025,940234 > +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:939988,939990,939999,940025,940234,940248 > > Modified: ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupForms.xml > URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupForms.xml?rev=940249&r1=940248&r2=940249&view=diff > ============================================================================== > --- ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupForms.xml (original) > +++ ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupForms.xml Sun May 2 15:54:05 2010 > @@ -60,7 +60,7 @@ under the License. > <form name="lookupPartyNameByName" target="LookupPartyExampleByName" type="single" > header-row-style="header-row" default-table-style="basic-table"> > <field name="LayerFromLayer" title="${uiLabelMap.ExampleLayerFromLayer}"> > - <lookup presentation="layer" target-form-name="LookupPartyExample"/> > + <lookup presentation="layer" target-form-name="LookupPartyExample" position="center"/> > </field> > <field name="CalendarFromLayer" title="${uiLabelMap.ExampleCalendarFromLayer}"><date-time/></field> > <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field> > > Propchange: ofbiz/branches/release10.04/specialpurpose/ebaystore/lib/ > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Sun May 2 15:54:05 2010 > @@ -1,3 +1,3 @@ > /ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087 > /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264 > -/ofbiz/trunk/specialpurpose/ebaystore/lib:939988,939990,939999,940025,940234 > +/ofbiz/trunk/specialpurpose/ebaystore/lib:939988,939990,939999,940025,940234,940248 > > Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Sun May 2 15:54:05 2010 > @@ -1,3 +1,3 @@ > /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456 > /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264 > -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:939988,939990,939999,940025,940234 > +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:939988,939990,939999,940025,940234,940248 > > Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Sun May 2 15:54:05 2010 > @@ -1,3 +1,3 @@ > /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456 > /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264 > -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:939988,939990,939999,940025,940234 > +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:939988,939990,939999,940025,940234,940248 > > Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Sun May 2 15:54:05 2010 > @@ -1,3 +1,3 @@ > /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456 > /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264 > -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:939988,939990,939999,940025,940234 > +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:939988,939990,939999,940025,940234,940248 > > |
smime.p7s (3K)
Re: svn commit: r940249 - in /ofbiz/branches/release10.04: ./ applications/order/script/org/
Administrator
|
Re: svn commit: r940249 - in /ofbiz/branches/release10.04: ./ applications/order/script/org/
|
Administrator
|
| Free forum by Nabble | Edit this page |