Administrator
|
Mmm, I will have to have a look at svn:mergeinfo, seems to be a bit heavier now, and maybe useless for us!
Jacques > Author: jleroux > Date: Sat May 1 12:30:07 2010 > New Revision: 939995 > > URL: http://svn.apache.org/viewvc?rev=939995&view=rev > Log: > "Applied fix from trunk for revision: 939990" > ------------------------------------------------------------------------ > r939990 | jleroux | 2010-05-01 14:16:17 +0200 (sam. 01 mai 2010) | 2 lignes > > ChartOfAccountsEntityLabelsdoes not exist yet and his blocking LookupGlAccount. > Try it at https://demo-trunk.ofbiz.apache.org/accounting/control/EditTaxAuthorityGlAccounts?taxAuthPartyId=_NA_&taxAuthGeoId=_NA_ > ------------------------------------------------------------------------ > > > Modified: > ofbiz/branches/release10.04/ (props changed) > ofbiz/branches/release10.04/applications/accounting/entitydef/entitymodel.xml > 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/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 Sat May 1 12:30:07 2010 > @@ -1,3 +1,3 @@ > /ofbiz/branches/addbirt:831210-885099,885686-886087 > /ofbiz/branches/multitenant20100310:921280-927264 > -/ofbiz/trunk:939988 > +/ofbiz/trunk:939988,939990 > > Modified: ofbiz/branches/release10.04/applications/accounting/entitydef/entitymodel.xml > URL: > http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/entitydef/entitymodel.xml?rev=939995&r1=939994&r2=939995&view=diff > ============================================================================== > --- ofbiz/branches/release10.04/applications/accounting/entitydef/entitymodel.xml (original) > +++ ofbiz/branches/release10.04/applications/accounting/entitydef/entitymodel.xml Sat May 1 12:30:07 2010 > @@ -1942,8 +1942,8 @@ under the License. > </entity> > <entity entity-name="GlAccount" > package-name="org.ofbiz.accounting.ledger" > - default-resource-name="ChartOfAccountsEntityLabels" > title="General Ledger Account Entity"> > + <!-- default-resource-name="ChartOfAccountsEntityLabels" <= this does not exist yet and his blocking > okupGlAccount --> > <field name="glAccountId" type="id-ne"></field> > <field name="glAccountTypeId" type="id"></field> > <field name="glAccountClassId" type="id"></field> > > Propchange: ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Sat May 1 12:30:07 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 > +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:939988,939990 > > Propchange: ofbiz/branches/release10.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Sat May 1 12:30:07 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 > +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:939988,939990 > > Propchange: ofbiz/branches/release10.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Sat May 1 12:30:07 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 > +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:939988,939990 > > Propchange: ofbiz/branches/release10.04/framework/common/widget/HelpScreens.xml > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Sat May 1 12:30:07 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 > +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:939988,939990 > > Propchange: ofbiz/branches/release10.04/specialpurpose/ebaystore/lib/ > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Sat May 1 12:30:07 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 > +/ofbiz/trunk/specialpurpose/ebaystore/lib:939988,939990 > > Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Sat May 1 12:30:07 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 > +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:939988,939990 > > Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Sat May 1 12:30:07 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 > +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:939988,939990 > > Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy > ------------------------------------------------------------------------------ > --- svn:mergeinfo (original) > +++ svn:mergeinfo Sat May 1 12:30:07 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 > +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:939988,939990 > > |
Free forum by Nabble | Edit this page |