You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2015/01/19 12:50:31 UTC
svn commit: r1652969 [1/5] - in
/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./
applications/accounting/script/org/ofbiz/accounting/cost/
applications/accounting/script/org/ofbiz/accounting/fixedasset/
applications/accounting/script/org/o...
Author: jleroux
Date: Mon Jan 19 11:50:29 2015
New Revision: 1652969
URL: http://svn.apache.org/r1652969
Log:
Keeps in sync with OFBiz trunk HEAD
Added:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/content/
- copied from r1652966, ofbiz/trunk/framework/widget/src/org/ofbiz/widget/content/
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/model/
- copied from r1652966, ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/portal/
- copied from r1652966, ofbiz/trunk/framework/widget/src/org/ofbiz/widget/portal/
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/renderer/
- copied from r1652966, ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/
Removed:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/cost/
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/payment/BillingServices.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/DataResourceWorkerInterface.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelActionVisitor.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelFieldVisitor.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelWidget.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelWidgetAction.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelWidgetCondition.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/ModelWidgetVisitor.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/PortalPageWorker.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/PortalPageWorkerInterface.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/WidgetContentWorker.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/WidgetDataResourceWorker.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/WidgetPortalPageWorker.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/fo/
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/menu/
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/text/
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/tree/
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/xml/
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed)
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/README
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_billing.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_cost.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_fixedasset.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_invoice.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/WEB-INF/controller.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/BillingAccountForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/BillingAccountScreens.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/cms/CmsEvents.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/content/ContentWorker.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/src/org/ofbiz/content/output/OutputServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/webapp/manufacturing/jobshopmgt/ShowProductionRun.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/checkoutshippingaddress.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/findOrders.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/data/PartyTypeData.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/catalog/ProductForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/src/org/ofbiz/common/email/EmailServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/WEB-INF/handlers-controller.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/PortalPageScreens.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/ecommain.css
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/fieldlookup.js
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/resources/templates/web.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/eca/ServiceEcaSetField.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/FormWidgetArtifactInfo.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ScreenWidgetArtifactInfo.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/src/org/ofbiz/webtools/print/FoPrintServerEvents.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/entity/EntityMaint.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/config/freemarkerTransforms.properties
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-common.xsd
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-form.xsd
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-menu.xsd
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-screen.xsd
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-tree.xsd
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/WidgetFactory.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/WidgetWorker.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/artifact/ArtifactInfoGatherer.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlFormMacroLibrary.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/BirtFactory.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/src/org/ofbiz/birt/email/BirtEmailServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/birt/WEB-INF/web.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/config/EcommerceUiLabels.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Mrv.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/content/Search.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentAddPrep.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ContentPrep.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/CurrentValPrep.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/EditAddPrep.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/FormPrep.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/HtmlAreaPrep.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/NodeTrailPrep.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/OwnerContentPrep.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PermPrep.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/PubInit.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/RespondPermAndPrep.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ResponsePrep.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/forum/ViewPrep.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/includes/MruAdd.groovy
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/src/org/ofbiz/example/ExamplePrintServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/script/org/ofbiz/googleCheckout/PrepareXMLTemplate.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/web.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/src/org/ofbiz/oagis/OagisServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/demotest/WEB-INF/web.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/webapp/scrum/WEB-INF/web.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/scrum/widget/scrumForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bluelight/includes/appbarOpen.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/droppingcrumbs/includes/appbarClose.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/droppingcrumbs/includes/appbarOpen.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/appbarClose.ftl
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/includes/appbarOpen.ftl
Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 19 11:50:29 2015
@@ -9,4 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1535158-1651037
+/ofbiz/trunk:1535158-1652966
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/README
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/README?rev=1652969&r1=1652968&r2=1652969&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/README (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/README Mon Jan 19 11:50:29 2015
@@ -1,14 +1,15 @@
Welcome to Apache OFBiz!
-All you need to run OFBiz is a 1.6 (version 6) JDK
+All you need to run OFBiz is a 1.7 (version 7) JDK
(not just the JRE, the full JDK).
http://java.sun.com/javase/downloads/index.jsp
You can load the demo data (strongly advised if you are new to
OFBiz) with the following command on the command line
from the OFBiz home folder (in Unix-like operating systems
-type "./ant" rather than "ant"):
+type "./ant" rather than "ant" to use the embed ant version
+ if you haven't installed it on your system) :
ant load-demo
@@ -17,10 +18,14 @@ Then start OFBiz:
ant start
(or "java -Xms128M -Xmx512M -XX:MaxPermSize=128m -jar ofbiz.jar")
+(you can also run directly "ant load-demo start")
Once OFBiz starts, you can look at the demo storefront at:
http://localhost:8080/ecommerce
+the back office at:
+https://localhost:8443/ordermgr
+
and the administration interface at:
https://localhost:8443/webtools
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml?rev=1652969&r1=1652968&r2=1652969&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml Mon Jan 19 11:50:29 2015
@@ -21,131 +21,6 @@ under the License.
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd">
- <!-- ================================================================ -->
- <!-- FixedAsset Services -->
- <!-- ================================================================ -->
-
- <!-- create a new Fixed Asset header record -->
- <simple-method method-name="createFixedAsset" short-description="Create an FixedAsset">
- <!-- create new entity and create all the fields -->
- <make-value value-field="newEntity" entity-name="FixedAsset"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
-
- <!-- create a non existing ID if not supplied -->
- <if-empty field="parameters.fixedAssetId">
- <sequenced-id sequence-name="FixedAsset" field="newEntity.fixedAssetId"/>
- <else>
- <!-- check the Duplicate ID> -->
- <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
- <if-not-empty field="fixedAsset">
- <add-error>
- <fail-property resource="AccountingUiLabels" property="AccountingFixedAssetIdAlreadyExists"/>
- </add-error>
- <log level="info" message="${AccountingUiLabels.AccountingFixedAssetIdAlreadyExists}"/>
- <else>
- <check-id field="parameters.fixedAssetId"/>
- </else>
- </if-not-empty>
- <check-errors/>
- <set from-field="parameters.fixedAssetId" field="newEntity.fixedAssetId"/>
- </else>
- </if-empty>
- <field-to-result field="newEntity.fixedAssetId" result-name="fixedAssetId"/>
-
- <!-- finally create the record (should not exist already)-->
- <create-value value-field="newEntity"/>
- </simple-method>
-
- <!-- update an existing Fixed Asset header Record -->
- <simple-method method-name="updateFixedAsset" short-description="Update an existing FixedAsset">
- <entity-one entity-name="FixedAsset" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- ================================================================ -->
- <!-- FixedAssetMember Services -->
- <!-- ================================================================ -->
-
- <!-- add a product to a fixed Asset -->
- <simple-method method-name="addFixedAssetProduct" short-description="Add Product to FixedAsset">
- <make-value value-field="newEntity" entity-name="FixedAssetProduct"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
-
- <if-empty field="newEntity.fromDate">
- <now-timestamp field="newEntity.fromDate"/>
- </if-empty>
-
- <create-value value-field="newEntity"/>
- </simple-method>
-
- <!-- update the product to fixed Asset link -->
- <simple-method method-name="updateFixedAssetProduct" short-description="Update Products of a FixedAsset">
- <entity-one entity-name="FixedAssetProduct" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- remove the productlink from the Fixed Asset -->
- <simple-method method-name="removeFixedAssetProduct" short-description="Remove Product From FixedAsset">
- <entity-one entity-name="FixedAssetProduct" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- ================================================================ -->
- <!-- FixedAssetCalendar Services -->
- <!-- ================================================================ -->
- <!-- update the calendar of the fixed Asset -->
-<!-- <simple-method method-name="updateFixedAssetCalendar" short-description="Update the calendar of the FixedAsset">
- <check-permission permission="ACCOUNTING" action="_UPDATE">
- <alt-permission permission="ACCOUNTING_ROLE" action="_UPDATE"/>
- <fail-property resource="AccountingUiLabels" property="AccountingUpdatePermissionError"/>
- </check-permission>
- <check-errors/>
-
- <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
-
- <make-value value-field="excDayPKMap" entity-name="TechDataCalendarExcDay"/>
- <set-pk-fields field-name= "calendarId" map="fixedAsset" value-field="excDayPKMap"/>
- <set-pk-fields fieldName= "exceptionDateStartTime" map="parameters" value-field="excDayPKMap"/>
- <find-by entity-name="TechDataCalendarExcDay" map-name="excDayPKMap" value-name="lookedUpValue"/>
- <set-nonpk-fields field-name="capacity" map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
-
-
- -->
-
-
- <!-- create a new FixedAssetStdCost -->
- <simple-method method-name="createFixedAssetStdCost" short-description="Create a FixedAssetStdCost">
- <!-- TODO: we should cancel the existing costs of the same type -->
- <!-- create new entity and create all the fields -->
-
- <!-- Check, should not exist already -->
- <entity-one entity-name="FixedAssetStdCost" value-field="fixedAssetStdCost"/>
- <if-not-empty field="fixedAssetStdCost">
- <add-error>
- <fail-property resource="AccountingUiLabels" property="AccountingFixedAssetStdCostAlreadyExists"/>
- </add-error>
- </if-not-empty>
- <check-errors/>
-
- <make-value value-field="newEntity" entity-name="FixedAssetStdCost"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
-
- <!-- finally create the record (should not exist already)-->
- <create-value value-field="newEntity"/>
- <check-errors/>
- </simple-method>
- <!-- update an existing FixedAssetStdCost -->
- <simple-method method-name="updateFixedAssetStdCost" short-description="Update an existing FixedAssetStdCost">
- <entity-one entity-name="FixedAssetStdCost" value-field="fixedAssetStdCost"/>
- <set-nonpk-fields map="parameters" value-field="fixedAssetStdCost"/>
- <store-value value-field="fixedAssetStdCost"/>
- </simple-method>
<!-- cancel an existing Agreement -->
<simple-method method-name="cancelFixedAssetStdCost" short-description="Cancel an existing FixedAssetStdCost">
<entity-one entity-name="FixedAssetStdCost" value-field="fixedAssetStdCost"/>
@@ -153,43 +28,6 @@ under the License.
<store-value value-field="fixedAssetStdCost"/>
</simple-method>
- <!-- Fixed Asset Identification "FIXED_ASSET_IDENT"-->
- <simple-method method-name="createFixedAssetIdent" short-description="Create an FixedAssetIdent">
- <make-value value-field="newEntity" entity-name="FixedAssetIdent"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateFixedAssetIdent" short-description="Update an existing FixedAssetIdent">
- <entity-one entity-name="FixedAssetIdent" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="removeFixedAssetIdent" short-description="Remove Fixed Assets Idents FixedAssetIdent">
- <entity-one entity-name="FixedAssetIdent" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- FixedAsset Registration Create/Update/Delete"-->
- <simple-method method-name="createFixedAssetRegistration" short-description="Create FixedAsset Registration">
- <make-value value-field="newEntity" entity-name="FixedAssetRegistration"/>
- <set-nonpk-fields map="parameters" value-field="newEntity"/>
- <set-pk-fields map="parameters" value-field="newEntity"/>
- <if-empty field="newEntity.fromDate">
- <now-timestamp field="newEntity.fromDate"/>
- </if-empty>
- <create-value value-field="newEntity"/>
- </simple-method>
- <simple-method method-name="updateFixedAssetRegistration" short-description="Update an existing FixedAsset Registration">
- <entity-one entity-name="FixedAssetRegistration" value-field="lookedUpValue"/>
- <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
- <simple-method method-name="deleteFixedAssetRegistration" short-description="Delete FixedAsset Registration">
- <entity-one entity-name="FixedAssetRegistration" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
<!-- create/update/delete FixedAssetMaint -->
<simple-method method-name="createFixedAssetMaint" short-description="create a FixedAssetMaint">
<make-value entity-name="FixedAssetMaint" value-field="newEntity"/>
@@ -305,10 +143,6 @@ under the License.
</then>
</if>
</simple-method>
- <simple-method method-name="deleteFixedAssetMaint" short-description="Delete FixedAsset Maintenance">
- <entity-one entity-name="FixedAssetMaint" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
<!-- create/update/delete FixedAssetMeter -->
<simple-method method-name="createFixedAssetMeter" short-description="Create a Fixed Asset Meter Reading">
@@ -328,10 +162,6 @@ under the License.
<set field="meterValue" from-field="lookedUpValue"/>
<call-simple-method method-name="createMaintsFromMeterReading"/>
</simple-method>
- <simple-method method-name="deleteFixedAssetMeter" short-description="Delete a Fixed Asset Meter Reading">
- <entity-one entity-name="FixedAssetMeter" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
<simple-method method-name="createMaintsFromMeterReading" short-description="Create Fixed Asset Maintenances From A Meter Reading">
<if-not-empty field="meterValue.maintHistSeqId">
<return/>
@@ -507,33 +337,6 @@ under the License.
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
</simple-method>
- <simple-method method-name="deleteFixedAssetMaintOrder" short-description="Delete FixedAsset Maintenance Order">
- <entity-one entity-name="FixedAssetMaintOrder" value-field="lookedUpValue"/>
- <remove-value value-field="lookedUpValue"/>
- </simple-method>
-
- <!-- ==============Party Fixed Asset Assignment============= -->
- <simple-method method-name="createPartyFixedAssetAssignment" short-description="Associate Party to Fixed Asset">
- <make-value entity-name="PartyFixedAssetAssignment" value-field="newEntity"/>
- <set-pk-fields value-field="newEntity" map="parameters"/>
- <set-nonpk-fields value-field="newEntity" map="parameters"/>
- <if-empty field="newEntity.fromDate">
- <now-timestamp field="nowTimestamp"/>
- <set field="newEntity.fromDate" from-field="nowTimestamp"/>
- </if-empty>
- <create-value value-field="newEntity"/>
- </simple-method>
-
- <simple-method method-name="updatePartyFixedAssetAssignment" short-description="Update Party to Fixed Asset">
- <entity-one entity-name="PartyFixedAssetAssignment" value-field="newEntity"/>
- <set-nonpk-fields value-field="newEntity" map="parameters"/>
- <store-value value-field="newEntity"/>
- </simple-method>
-
- <simple-method method-name="deletePartyFixedAssetAssignment" short-description="Delete Party to Fixed Asset">
- <entity-one entity-name="PartyFixedAssetAssignment" value-field="newEntity"/>
- <remove-value value-field="newEntity"/>
- </simple-method>
<simple-method method-name="autoAssignFixedAssetPartiesToMaintenance" login-required="true"
short-description="Auto-assign Fixed Asset Parties to a Fixed Asset Maintenance">
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=1652969&r1=1652968&r2=1652969&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Mon Jan 19 11:50:29 2015
@@ -45,14 +45,14 @@ under the License.
<set field="customMethodName" value="invoiceSequenceRestart"/>
</if-compare>
</else>
- </if-not-empty>
+ </if-not-empty>
<if-not-empty field="customMethodName">
<set-service-fields service-name="${customMethodName}" map="parameters" to-map="customMethodMap"/>
<set field="customMethodMap.partyAcctgPreference" from-field="partyAcctgPreference"/>
<call-service service-name="${customMethodName}" in-map-name="customMethodMap">
<result-to-field result-name="invoiceId" field="invoiceIdTemp"/>
- </call-service>
+ </call-service>
<else>
<log level="info" message="In createInvoice sequence enum Standard"/>
<!-- default to the default sequencing: INVSQ_STANDARD -->
@@ -172,7 +172,7 @@ under the License.
<if-not-empty field="party.preferredCurrencyUomId">
<set field="parameters.currencyUomId" from-field="party.preferredCurrencyUomId"/>
</if-not-empty>
-
+
<set-nonpk-fields map="parameters" value-field="newEntity"/>
<set-pk-fields map="parameters" value-field="newEntity"/>
<create-value value-field="newEntity"/>
@@ -610,12 +610,6 @@ under the License.
<field-to-result field="contactMechId" result-name="invoiceContactMech"/>
</simple-method>
- <simple-method method-name="updateInvoiceItemType" short-description="Updates a InvoiceItemType Record">
- <entity-one entity-name="InvoiceItemType" value-field="lookedUpValue"/>
- <set-nonpk-fields value-field="lookedUpValue" map="parameters"/>
- <store-value value-field="lookedUpValue"/>
- </simple-method>
-
<simple-method method-name="autoGenerateInvoiceFromExistingInvoice" short-description="Scheduled service to generate Invoice from an existing Invoice">
<entity-and entity-name="Invoice" list="invoices">
<field-map field-name="recurrenceInfoId" from-field="parameters.recurrenceInfoId"/>
@@ -640,7 +634,7 @@ under the License.
<call-service service-name="updateInvoice" in-map-name="updateInvoiceCtx"/>
</iterate>
</simple-method>
-
+
<simple-method method-name="cancelInvoice" short-description="Service to cancel the Invoices">
<entity-one entity-name="Invoice" value-field="invoice"/>
<if-empty field="invoice">
@@ -697,7 +691,7 @@ under the License.
<set field="invoiceRunningTotal" value="${groovy:org.ofbiz.base.util.UtilFormatOut.formatCurrency(runningTotal, currencyUomId, parameters.locale)}"/>
<field-to-result field="invoiceRunningTotal"/>
</simple-method>
-
+
<simple-method method-name="getInvoicesFilterByAssocType" short-description="Filter invoices by invoiceItemAssocTypeId">
<set field="invoiceList" from-field="parameters.invoiceList"/>
<set field="invoiceItemAssocTypeId" from-field="parameters.invoiceItemAssocTypeId"/>
@@ -1010,7 +1004,7 @@ under the License.
<set-service-fields service-name="updateSimpleTextContent" map="parameters" to-map="updateSimpleText"/>
<call-service service-name="updateSimpleTextContent" in-map-name="updateSimpleText"/>
</simple-method>
-
+
<simple-method method-name="isInvoiceInForeignCurrency" short-description="check if a invoice is in a foreign currency related to the accounting company.">
<entity-one value-field="invoice" entity-name="InvoiceAndType">
<field-map field-name="invoiceId" from-field="parameters.invoiceId"/>
@@ -1021,10 +1015,10 @@ under the License.
</if-empty>
<if-compare field="invoice.parentTypeId" operator="equals" value="PURCHASE_INVOICE">
<set field="pref.organizationPartyId" from-field="invoice.partyId"/>
- </if-compare>
+ </if-compare>
<if-compare field="invoice.parentTypeId" operator="equals" value="SALES_INVOICE">
<set field="pref.organizationPartyId" from-field="invoice.partyIdFrom"/>
- </if-compare>
+ </if-compare>
<call-service service-name="getPartyAccountingPreferences" in-map-name="pref">
<result-to-field result-name="partyAccountingPreference"/>
</call-service>
@@ -1036,5 +1030,5 @@ under the License.
</if-compare-field>
<field-to-result field="isForeign"/>
</simple-method>
-
+
</simple-methods>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=1652969&r1=1652968&r2=1652969&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Mon Jan 19 11:50:29 2015
@@ -125,9 +125,9 @@ under the License.
</if-compare>
<check-errors/>
- <set field="statusIdSave" from-field="payment.statusId"/> <!-- do not allow status change here -->
+ <set field="statusIdSave" from-field="payment.statusId"/><!-- do not allow status change here -->
<set-nonpk-fields map="parameters" value-field="payment"/>
- <set field="payment.statusId" from-field="statusIdSave"/> <!-- do not allow status change here -->
+ <set field="payment.statusId" from-field="statusIdSave"/><!-- do not allow status change here -->
<if-empty field="payment.effectiveDate">
<now-timestamp field="payment.effectiveDate"/>
@@ -262,20 +262,19 @@ under the License.
</if-compare-field>
</if-empty>
</if-not-empty>
-
-
+
<if-not-empty field="parameters.billingAccountId">
<if-empty field="paymentAppl.amountApplied">
<set field="paymentAppl.amountApplied" from-field="notAppliedPayment"/>
</if-empty>
</if-not-empty>
-
+
<if-not-empty field="parameters.taxAuthGeoId">
<if-empty field="paymentAppl.amountApplied">
<set field="paymentAppl.amountApplied" from-field="notAppliedPayment"/>
</if-empty>
</if-not-empty>
-
+
<sequenced-id sequence-name="PaymentApplication" field="paymentAppl.paymentApplicationId"/>
<field-to-result field="paymentAppl.amountApplied" result-name="amountApplied"/>
<field-to-result field="paymentAppl.paymentApplicationId" result-name="paymentApplicationId"/>
@@ -283,7 +282,6 @@ under the License.
<create-value value-field="paymentAppl"/>
<entity-one value-field="payment" entity-name="Payment"/>
<field-to-result field="payment.paymentTypeId" result-name="paymentTypeId"/>
-
</simple-method>
<simple-method method-name="setPaymentStatus" short-description="Set The Payment Status">
@@ -330,7 +328,6 @@ under the License.
</then>
</if>
-
<!-- check if the payment fully applied when set to confirmed-->
<if-compare field="parameters.statusId" operator="equals" value="PMNT_CONFIRMED">
<set field="notYetApplied" value="${groovy:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment)}"/>
@@ -362,7 +359,6 @@ under the License.
<!-- everything ok so now change the status field -->
<set from-field="parameters.statusId" field="payment.statusId"/>
<store-value value-field="payment"/>
-
</else>
</if-empty>
</if-compare-field>
@@ -536,7 +532,7 @@ under the License.
</iterate>
<field-to-result field="selectedInvoicePaymentInfoList" result-name="invoicePaymentInfoList"/>
</simple-method>
-
+
<simple-method method-name="voidPayment" short-description="Service to void a payment">
<check-permission permission="ACCOUNTING" action="_UPDATE">
<alt-permission permission="ACCOUNTING_ROLE" action="_UPDATE"/>
@@ -620,7 +616,7 @@ under the License.
<fail-property resource="AccountingUiLabels" property="AccountingTransactionIsAlreadyReconciled"/>
</add-error>
<check-errors/>
- </if-compare>
+ </if-compare>
<iterate list="paymentGroupMemberAndTransList" entry="paymentGroupMemberAndTrans">
<set-service-fields service-name="expirePaymentGroupMember" map="paymentGroupMemberAndTrans" to-map="expirePaymentGroupMemberMap"/>
<call-service service-name="expirePaymentGroupMember" in-map-name="expirePaymentGroupMemberMap"/>
@@ -635,7 +631,7 @@ under the License.
</iterate>
</if-not-empty>
</simple-method>
-
+
<simple-method method-name="createPaymentAndPaymentGroupForInvoices" short-description="Creates Payments, PaymentApplications and PaymentGroup for the same">
<entity-one entity-name="PaymentMethod" value-field="paymentMethod" auto-field-map="true"/>
<entity-one entity-name="FinAccount" value-field="finAccount" auto-field-map="false">
@@ -653,7 +649,7 @@ under the License.
</if-compare>
<check-errors/>
<set field="invoices" type="List"/>
- <iterate list="parameters.invoiceIds" entry="invoiceId">
+ <iterate list="parameters.invoiceIds" entry="invoiceId">
<entity-one entity-name="Invoice" value-field="invoice" auto-field-map="true"/>
<clear-field field="invoices"/>
<set field="invoices" from-field="partyInvoices.${invoice.partyIdFrom}"/>
@@ -689,7 +685,7 @@ under the License.
<field-to-result field="errorMessage" result-name="errorMessage"/>
</if-empty>
</simple-method>
-
+
<simple-method method-name="createPaymentAndApplicationForParty" short-description="create Payment and PaymentApplications for multiple invoices for one party">
<set field="paymentAmount" type="BigDecimal" value="0"/>
<iterate list="parameters.invoices" entry="invoice">
@@ -748,14 +744,14 @@ under the License.
<set field="amount" type="BigDecimal" from-field="paymentAmount"/>
<field-to-result field="amount"/>
</simple-method>
-
+
<simple-method method-name="createFinAccoutnTransFromPayment" short-description="Creates a record for FinAccountTrans on creation of payment.">
<set-service-fields service-name="createFinAccountTrans" map="parameters" to-map="createFinAccountTransMap"/>
<set field="createFinAccountTransMap.finAccountTransTypeId" value="WITHDRAWAL"/>
<set field="createFinAccountTransMap.partyId" from-field="parameters.organizationPartyId"/>
<now-timestamp field="createFinAccountTransMap.transactionDate"/>
<now-timestamp field="createFinAccountTransMap.entryDate"/>
- <!-- set field="createFinAccountTransMap.statusId" value="CREATE"/> --> <!-- TODO: It will uncomment when status Id field will add in FinAccountTrans Entity. -->
+ <!-- set field="createFinAccountTransMap.statusId" value="CREATE"/>--><!-- TODO: It will uncomment when status Id field will add in FinAccountTrans Entity. -->
<set field="createFinAccountTransMap.comments" value="Pay to ${parameters.partyId} for invoice Ids - ${parameters.invoiceIds}"/>
<call-service service-name="createFinAccountTrans" in-map-name="createFinAccountTransMap">
<result-to-field result-name="finAccountTransId"/>
@@ -784,7 +780,7 @@ under the License.
<call-service service-name="createPaymentGroupMember" in-map-name="createPaymentGroupMemberMap"/>
</iterate>
</simple-method>
-
+
<simple-method method-name="cancelCheckRunPayments" short-description="Cancel all payments for payment group">
<entity-and entity-name="PmtGrpMembrPaymentAndFinAcctTrans" list="paymentGroupMemberAndTransList">
<field-map field-name="paymentGroupId" from-field="parameters.paymentGroupId"/>
@@ -810,7 +806,7 @@ under the License.
</else>
</if-compare>
</simple-method>
-
+
<simple-method method-name="getPayments" short-description="Get list of payment">
<set field="paymentGroupId" from-field="parameters.paymentGroupId"/>
<if-not-empty field="paymentGroupId">
@@ -878,11 +874,11 @@ under the License.
<set-service-fields service-name="createPaymentGroupAndMember" map="parameters" to-map="createPaymentGroupAndMemberMap"/>
<call-service service-name="createPaymentGroupAndMember" in-map-name="createPaymentGroupAndMemberMap">
<result-to-result result-name="paymentGroupId"/>
- </call-service>
+ </call-service>
</else>
</if-not-empty>
</simple-method>
-
+
<simple-method method-name="massChangePaymentStatus" short-description="Service set status of Payments in bulk.">
<iterate list="parameters.paymentIds" entry="paymentId">
<set field="setPaymentStatusMap.paymentId" from-field="paymentId"/>
@@ -893,7 +889,6 @@ under the License.
</simple-method>
<simple-method method-name="createPaymentFromOrder" short-description="Service auto create Payment from Order when payment does exist yet and not diabled by accountingconfig">
-
<entity-one value-field="orderHeader" entity-name="OrderHeader"/>
<if-compare operator="equals" value="PURCHASE_ORDER" field="orderHeader.orderTypeId">
@@ -1015,7 +1010,7 @@ under the License.
<set field="parameters.amount" from-field="orderHeader.grandTotal" />
</else>
</if>
-
+
<set field="parameters.partyIdFrom" from-field="orderRoleFrom.partyId"/>
<set field="parameters.partyIdTo" from-field="orderRoleTo.partyId"/>
<set field="parameters.paymentMethodTypeId" value="COMPANY_ACCOUNT"/>
@@ -1036,15 +1031,14 @@ under the License.
<field-to-result field="parameters.paymentId" result-name="paymentId"/>
<log level="info" message="payment ${parameters.paymentId} with the not-paid status automatically created from order: ${parameters.orderId} (can be disabled in AccountingConfig.properties)"/>
</simple-method>
-
+
<simple-method method-name="createMatchingPaymentApplication" short-description="Create a payment application if either the invoice of payment could be found">
-
<property-to-field resource="AccountingConfig" property="accounting.payment.application.autocreate" field="autoCreate" default="Y"/>
<if-compare operator="not-equals" value="Y" field="autoCreate">
<log level="info" message="payment application not automatically created because config is not set to Y"/>
<return/>
</if-compare>
-
+
<if-not-empty field="parameters.invoiceId">
<entity-one value-field="invoice" entity-name="Invoice"/>
<if-not-empty field="invoice">
@@ -1099,7 +1093,7 @@ under the License.
</if-not-empty>
</if-not-empty>
</if-not-empty>
-
+
<if-not-empty field="parameters.paymentId">
<entity-one value-field="payment" entity-name="Payment"/>
<if-not-empty field="payment">
@@ -1123,21 +1117,21 @@ under the License.
<set field="checkInvoice.invoiceId" from="invoice.invoiceId"/>
<call-service service-name="isInvoiceInForeignCurrency" in-map-name="checkInvoice">
<result-to-field result-name="isForeign"/>
- </call-service>
+ </call-service>
<if-compare operator="equals" value="true" field="isForeign">
<if-compare-field operator="equals" field="invoiceTotal" to-field="payment.actualCurrencyAmount">
<if-compare-field operator="equals" field="invoice.currencyUomId" to-field="payment.actualCurrencyUomId">
<set field="invoiceId" from-field="invoice.invoiceId"/>
<set field="amountApplied" from-field="payment.actualCurrencyAmount"/>
- </if-compare-field>
- </if-compare-field>
+ </if-compare-field>
+ </if-compare-field>
<else>
<if-compare-field operator="equals" field="invoiceTotal" to-field="payment.amount">
<if-compare-field operator="equals" field="invoice.currencyUomId" to-field="payment.currencyUomId">
<set field="invoiceId" from-field="invoice.invoiceId"/>
<set field="amountApplied" from-field="payment.amount"/>
- </if-compare-field>
- </if-compare-field>
+ </if-compare-field>
+ </if-compare-field>
</else>
</if-compare>
</iterate>
@@ -1153,16 +1147,15 @@ under the License.
</if-not-empty>
</if-not-empty>
</if-not-empty>
-
-
+
<if-not-empty field="createAppl.paymentId">
<if-not-empty field="createAppl.invoiceId">
- <call-service service-name="createPaymentApplication" in-map-name="createAppl"/>
+ <call-service service-name="createPaymentApplication" in-map-name="createAppl"/>
<log level="info" message="payment application automatically created between invoiceId: ${createAppl.invoiceId} and paymentId: ${createAppl.paymentId} for the amount: ${createAppl.appliedAmount} (can be disabled in AccountingConfig.properties)"/>
</if-not-empty>
</if-not-empty>
</simple-method>
-
+
<!-- PaymentContent -->
<simple-method method-name="createPaymentContent" short-description="Create Content For Payment">
<make-value value-field="newEntity" entity-name="PaymentContent"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_billing.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_billing.xml?rev=1652969&r1=1652968&r2=1652969&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_billing.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_billing.xml Mon Jan 19 11:50:29 2015
@@ -25,83 +25,63 @@ under the License.
<version>1.0</version>
<!-- Billing Account Services -->
- <service name="createBillingAccount" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/payment/BillingServices.xml" invoke="createBillingAccount">
+ <service name="createBillingAccount" default-entity-name="BillingAccount" engine="entity-auto" invoke="create" auth="true">
<description>Create a Billing Account</description>
<permission-service service-name="acctgBillingAcctCheck" main-action="CREATE"/>
- <attribute name="accountLimit" type="BigDecimal" mode="IN" optional="true"/>
- <attribute name="accountCurrencyUomId" type="String" mode="IN" optional="true"/>
- <attribute name="description" type="String" mode="IN" optional="true"/>
- <attribute name="contactMechId" type="String" mode="IN" optional="true"/>
- <attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/>
- <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
- <attribute name="roleTypeId" type="String" mode="IN" optional="true"/>
- <attribute name="partyId" type="String" mode="IN" optional="true"/>
- <attribute name="billingAccountId" type="String" mode="OUT" optional="false"/>
+ <auto-attributes include="pk" mode="OUT" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="updateBillingAccount" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/payment/BillingServices.xml" invoke="updateBillingAccount">
+ <service name="updateBillingAccount" default-entity-name="BillingAccount" engine="entity-auto" invoke="update" auth="true">
<description>Update a Billing Account</description>
<permission-service service-name="acctgBillingAcctCheck" main-action="UPDATE"/>
- <attribute name="billingAccountId" type="String" mode="IN" optional="false"/>
- <attribute name="accountLimit" type="BigDecimal" mode="IN" optional="true"/>
- <attribute name="accountCurrencyUomId" type="String" mode="IN" optional="true"/>
- <attribute name="description" type="String" mode="IN" optional="true"/>
- <attribute name="contactMechId" type="String" mode="IN" optional="true"/>
- <attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/>
- <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="createBillingAccountRole" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/payment/BillingServices.xml" invoke="createBillingAccountRole">
+ <service name="createBillingAccountRole" default-entity-name="BillingAccountRole" engine="entity-auto" invoke="create" auth="true">
<description>Create a Billing Account Role</description>
<permission-service service-name="acctgBillingAcctCheck" main-action="CREATE"/>
- <attribute name="billingAccountId" type="String" mode="IN" optional="false"/>
- <attribute name="partyId" type="String" mode="IN" optional="false"/>
- <attribute name="roleTypeId" type="String" mode="IN" optional="false"/>
- <attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/>
- <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="fromDate" optional="true"/>
</service>
- <service name="updateBillingAccountRole" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/payment/BillingServices.xml" invoke="updateBillingAccountRole">
+ <service name="updateBillingAccountRole" default-entity-name="BillingAccountRole" engine="entity-auto" invoke="update" auth="true">
<description>Update a Billing Account Role</description>
<permission-service service-name="acctgBillingAcctCheck" main-action="UPDATE"/>
- <attribute name="billingAccountId" type="String" mode="IN" optional="false"/>
- <attribute name="partyId" type="String" mode="IN" optional="false"/>
- <attribute name="roleTypeId" type="String" mode="IN" optional="false"/>
- <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/>
- <attribute name="thruDate" type="Timestamp" mode="IN" optional="false"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="removeBillingAccountRole" engine="simple" default-entity-name="BillingAccountRole"
- location="component://accounting/script/org/ofbiz/accounting/payment/BillingServices.xml" invoke="removeBillingAccountRole">
+ <service name="removeBillingAccountRole" default-entity-name="BillingAccountRole" engine="entity-auto" invoke="delete" auth="true">
<description>Remove a Billing Account Role</description>
<permission-service service-name="acctgBillingAcctCheck" main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
- <service name="createBillingAccountTerm" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/payment/BillingServices.xml" invoke="createBillingAccountTerm">
+ <service name="createBillingAccountAndRole" engine="group" auth="true">
+ <group>
+ <invoke name="createBillingAccount" mode="sync" result-to-context="true"/>
+ <invoke name="createBillingAccountRole" mode="sync" parameters="optional"/>
+ </group>
+ <override name="billingAccountId" optional="true"/>
+ </service>
+ <service name="createBillingAccountTerm" default-entity-name="BillingAccountTerm" engine="entity-auto" invoke="create" auth="true">
<description>Create a Billing Account Term</description>
<permission-service service-name="acctgBillingAcctCheck" main-action="CREATE"/>
- <attribute name="billingAccountId" type="String" mode="IN" optional="false"/>
- <attribute name="termTypeId" type="String" mode="IN" optional="false"/>
- <attribute name="termValue" type="BigDecimal" mode="IN" optional="false"/>
- <attribute name="uomId" type="String" mode="IN" optional="true"/>
- <attribute name="billingAccountTermId" type="String" mode="OUT" optional="false"/>
+ <auto-attributes include="pk" mode="OUT" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="termTypeId" optional="false"/>
+ <override name="billingAccountId" optional="false"/>
</service>
- <service name="updateBillingAccountTerm" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/payment/BillingServices.xml" invoke="updateBillingAccountTerm">
+ <service name="updateBillingAccountTerm" default-entity-name="BillingAccountTerm" engine="entity-auto" invoke="update" auth="true">
<description>Update a Billing Account Term</description>
<permission-service service-name="acctgBillingAcctCheck" main-action="UPDATE"/>
- <attribute name="billingAccountTermId" type="String" mode="IN" optional="false"/>
- <attribute name="billingAccountId" type="String" mode="IN" optional="true"/>
- <attribute name="termTypeId" type="String" mode="IN" optional="true"/>
- <attribute name="termValue" type="BigDecimal" mode="IN" optional="true"/>
- <attribute name="uomId" type="String" mode="IN" optional="true"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
+ <override name="termTypeId" optional="false"/>
+ <override name="billingAccountId" optional="false"/>
</service>
- <service name="removeBillingAccountTerm" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/payment/BillingServices.xml" invoke="removeBillingAccountTerm">
+ <service name="removeBillingAccountTerm" default-entity-name="BillingAccountTerm" engine="entity-auto" invoke="delete" auth="true">
<description>Remove a Billing Account Term</description>
<permission-service service-name="acctgBillingAcctCheck" main-action="DELETE"/>
- <attribute name="billingAccountTermId" type="String" mode="IN" optional="false"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
</service>
<service name="calcBillingAccountBalance" engine="java"
location="org.ofbiz.accounting.payment.BillingAccountWorker" invoke="calcBillingAccountBalance">
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_cost.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_cost.xml?rev=1652969&r1=1652968&r2=1652969&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_cost.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_cost.xml Mon Jan 19 11:50:29 2015
@@ -24,32 +24,28 @@ under the License.
<vendor>OFBiz</vendor>
<version>1.0</version>
- <service name="createCostComponentCalc" default-entity-name="CostComponentCalc" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/cost/CostServices.xml" invoke="createCostComponentCalc" auth="true">
+ <service name="createCostComponentCalc" default-entity-name="CostComponentCalc" engine="entity-auto" invoke="create" auth="true">
<description>Create a CostComponentCalc</description>
<permission-service service-name="acctgCostPermissionCheck" main-action="CREATE"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<auto-attributes include="pk" mode="OUT" optional="true"/>
</service>
- <service name="updateCostComponentCalc" default-entity-name="CostComponentCalc" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/cost/CostServices.xml" invoke="updateCostComponentCalc" auth="true">
+ <service name="updateCostComponentCalc" default-entity-name="CostComponentCalc" engine="entity-auto" invoke="update" auth="true">
<description>Update a CostComponentCalc</description>
<permission-service service-name="acctgCostPermissionCheck" main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="removeCostComponentCalc" default-entity-name="CostComponentCalc" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/cost/CostServices.xml" invoke="removeCostComponentCalc" auth="true">
+ <service name="removeCostComponentCalc" default-entity-name="CostComponentCalc" engine="entity-auto" invoke="delete" auth="true">
<description>Remove a CostComponentCalc</description>
<permission-service service-name="acctgCostPermissionCheck" main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="createWorkEffortCostCalc" default-entity-name="WorkEffortCostCalc" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/cost/CostServices.xml" invoke="createWorkEffortCostCalc" auth="true">
+ <service name="createWorkEffortCostCalc" default-entity-name="WorkEffortCostCalc" engine="entity-auto" invoke="create" auth="true">
<description>Create a WorkEffortCostCalc entry</description>
<permission-service service-name="acctgCostPermissionCheck" main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
@@ -57,8 +53,7 @@ under the License.
<override name="fromDate" optional="true"/>
</service>
- <service name="removeWorkEffortCostCalc" default-entity-name="WorkEffortCostCalc" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/cost/CostServices.xml" invoke="removeWorkEffortCostCalc" auth="true">
+ <service name="removeWorkEffortCostCalc" default-entity-name="WorkEffortCostCalc" engine="entity-auto" invoke="delete" auth="true">
<description>Remove a WorkEffortCostCalc entry</description>
<permission-service service-name="acctgCostPermissionCheck" main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_fixedasset.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_fixedasset.xml?rev=1652969&r1=1652968&r2=1652969&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_fixedasset.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_fixedasset.xml Mon Jan 19 11:50:29 2015
@@ -25,16 +25,14 @@ under the License.
<version>1.0</version>
<!-- Fixed Asset -->
- <service name="createFixedAsset" default-entity-name="FixedAsset" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="createFixedAsset" auth="true">
+ <service name="createFixedAsset" default-entity-name="FixedAsset" engine="entity-auto" invoke="create" auth="true">
<description>Create a Fixed Asset</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
<auto-attributes include="pk" mode="INOUT" optional="true"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<override name="fixedAssetTypeId" optional="false"/>
</service>
- <service name="updateFixedAsset" default-entity-name="FixedAsset" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="updateFixedAsset" auth="true">
+ <service name="updateFixedAsset" default-entity-name="FixedAsset" engine="entity-auto" invoke="update" auth="true">
<description>Update a Fixed Asset</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
@@ -43,51 +41,34 @@ under the License.
</service>
<!-- Product to Fixed Asset maintenance -->
- <service name="addFixedAssetProduct" default-entity-name="FixedAssetProduct" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="addFixedAssetProduct" auth="true">
+ <service name="addFixedAssetProduct" default-entity-name="FixedAssetProduct" engine="entity-auto" invoke="create" auth="true">
<description>Add Product To Fixed Asset</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<override name="fromDate" optional="true"/>
</service>
-
- <service name="updateFixedAssetProduct" default-entity-name="FixedAssetProduct" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="updateFixedAssetProduct" auth="true">
+ <service name="updateFixedAssetProduct" default-entity-name="FixedAssetProduct" engine="entity-auto" invoke="update" auth="true">
<description>Update the Product to Fixed Asset information</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
-
- <service name="removeFixedAssetProduct" default-entity-name="FixedAssetProduct" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="removeFixedAssetProduct" auth="true">
+ <service name="removeFixedAssetProduct" default-entity-name="FixedAssetProduct" engine="entity-auto" invoke="delete" auth="true">
<description>Remove Product From Fixed Asset</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
- <!-- TO BE REMOVED : Fixed Asset calendar
- <service name="updateFixedAssetCalendar" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="updateFixedAssetCalendar" auth="true">
- <description>Update the Capacity available of Calendar of a Fixed Asset information</description>
- <attribute name="fixedAssetId" type="Id" mode="IN" optional="false"/>
- <attribute name="exceptionDateStartTime" type="Timestamp" mode="IN" optional="false"/>
- <attribute name="exceptionCapacity" type="Timestamp" mode="IN" optional="false"/>
- <attribute name="capacity" type="BigDecimal" mode="IN" optional="true"/>
- </service>
- -->
-
<!-- FixedAssetStdCost -->
- <service name="createFixedAssetStdCost" default-entity-name="FixedAssetStdCost" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="createFixedAssetStdCost" auth="true">
+ <!-- TODO: we should cancel the existing costs of the same type with seca -->
+ <service name="createFixedAssetStdCost" default-entity-name="FixedAssetStdCost" engine="entity-auto" invoke="create" auth="true">
<description>Create a Fixed Asset Standard Cost</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="updateFixedAssetStdCost" default-entity-name="FixedAssetStdCost" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="updateFixedAssetStdCost" auth="true">
+ <service name="updateFixedAssetStdCost" default-entity-name="FixedAssetStdCost" engine="entity-auto" invoke="update" auth="true">
<description>Update a Fixed Asset Standard Cost</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
@@ -102,44 +83,38 @@ under the License.
</service>
<!-- FixedAssetIdent -->
- <service name="createFixedAssetIdent" default-entity-name="FixedAssetIdent" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="createFixedAssetIdent" auth="true">
+ <service name="createFixedAssetIdent" default-entity-name="FixedAssetIdent" engine="entity-auto" invoke="create" auth="true">
<description>Create a Fixed Asset Identification</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="updateFixedAssetIdent" default-entity-name="FixedAssetIdent" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="updateFixedAssetIdent" auth="true">
+ <service name="updateFixedAssetIdent" default-entity-name="FixedAssetIdent" engine="entity-auto" invoke="update" auth="true">
<description>Update a Fixed Asset Identification</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="removeFixedAssetIdent" default-entity-name="FixedAssetIdent" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="removeFixedAssetIdent" auth="true">
+ <service name="removeFixedAssetIdent" default-entity-name="FixedAssetIdent" engine="entity-auto" invoke="delete" auth="true">
<description>Remove a Fixed Asset Identification</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
<!-- Equipment Registration Create/Update/Delete-->
- <service name="createFixedAssetRegistration" default-entity-name="FixedAssetRegistration" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="createFixedAssetRegistration" auth="true">
+ <service name="createFixedAssetRegistration" default-entity-name="FixedAssetRegistration" engine="entity-auto" invoke="create" auth="true">
<description>Create a Fixed Asset Registration</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<override name="fromDate" optional="true"/>
</service>
- <service name="updateFixedAssetRegistration" default-entity-name="FixedAssetRegistration" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="updateFixedAssetRegistration" auth="true">
+ <service name="updateFixedAssetRegistration" default-entity-name="FixedAssetRegistration" engine="entity-auto" invoke="update" auth="true">
<description>Update a Fixed Asset Registration</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="deleteFixedAssetRegistration" default-entity-name="FixedAssetRegistration" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="deleteFixedAssetRegistration" auth="true">
+ <service name="deleteFixedAssetRegistration" default-entity-name="FixedAssetRegistration" engine="entity-auto" invoke="delete" auth="true">
<description>Delete a Fixed Asset Registration</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
@@ -164,8 +139,7 @@ under the License.
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<attribute name="oldStatusId" type="String" mode="OUT" optional="false"/>
</service>
- <service name="deleteFixedAssetMaint" default-entity-name="FixedAssetMaint" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="deleteFixedAssetMaint" auth="true">
+ <service name="deleteFixedAssetMaint" default-entity-name="FixedAssetMaint" engine="entity-auto" invoke="delete" auth="true">
<description>Remove a Fixed Asset Maintenance</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
@@ -192,8 +166,7 @@ under the License.
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="deleteFixedAssetMeter" default-entity-name="FixedAssetMeter" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="deleteFixedAssetMeter" auth="true">
+ <service name="deleteFixedAssetMeter" default-entity-name="FixedAssetMeter" engine="entity-auto" invoke="delete" auth="true">
<description>Remove a Fixed Asset Maintenance Meter</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
@@ -209,33 +182,27 @@ under the License.
<attribute name="orderItemSeqId" type="String" mode="IN" optional="true"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="deleteFixedAssetMaintOrder" default-entity-name="FixedAssetMaintOrder" engine="simple"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="deleteFixedAssetMaintOrder" auth="true">
+ <service name="deleteFixedAssetMaintOrder" default-entity-name="FixedAssetMaintOrder" engine="entity-auto" invoke="delete" auth="true">
<description>Remove a Fixed Asset Maintenance Order</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
</service>
<!-- =========Party Fixed Asset Assignment Services========= -->
- <service name="createPartyFixedAssetAssignment" engine="simple" default-entity-name="PartyFixedAssetAssignment"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="createPartyFixedAssetAssignment" auth="true">
+ <service name="createPartyFixedAssetAssignment" default-entity-name="PartyFixedAssetAssignment" engine="entity-auto" invoke="create" auth="true">
<description>Add Party to a Fixed Asset</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
<override name="fromDate" optional="true"/>
</service>
-
- <service name="updatePartyFixedAssetAssignment" engine="simple" default-entity-name="PartyFixedAssetAssignment"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="updatePartyFixedAssetAssignment" auth="true">
+ <service name="updatePartyFixedAssetAssignment" default-entity-name="PartyFixedAssetAssignment" engine="entity-auto" invoke="update" auth="true">
<description>Update Party to Fixed Asset</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
-
- <service name="deletePartyFixedAssetAssignment" engine="simple" default-entity-name="PartyFixedAssetAssignment"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="deletePartyFixedAssetAssignment" auth="true">
+ <service name="deletePartyFixedAssetAssignment" default-entity-name="PartyFixedAssetAssignment" engine="entity-auto" invoke="delete" auth="true">
<description>Delete Party to Fixed Asset</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="DELETE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
@@ -248,17 +215,17 @@ under the License.
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
- <service name="deleteFixedAssetDepMethod" default-entity-name="FixedAssetDepMethod" engine="entity-auto" invoke="delete" auth="true">
- <description>Delete a Fixed Asset Depreciation Method</description>
- <permission-service service-name="fixedAssetPermissionCheck" main-action="DELETE"/>
- <auto-attributes include="pk" mode="IN" optional="false"/>
- </service>
<service name="updateFixedAssetDepMethod" default-entity-name="FixedAssetDepMethod" engine="entity-auto" invoke="update" auth="true">
<description>Create a Fixed Asset Depreciation Method</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="UPDATE"/>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
+ <service name="deleteFixedAssetDepMethod" default-entity-name="FixedAssetDepMethod" engine="entity-auto" invoke="delete" auth="true">
+ <description>Delete a Fixed Asset Depreciation Method</description>
+ <permission-service service-name="fixedAssetPermissionCheck" main-action="DELETE"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ </service>
<service name="checkUpdateFixedAssetDepreciation" default-entity-name="AcctgTrans" engine="simple"
location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="checkUpdateFixedAssetDepreciation" auth="true">
<description>If the accounting transaction is a depreciation transaction for a fixed asset, update the depreciation amount in the FixedAsset entity.</description>
@@ -300,13 +267,13 @@ under the License.
<attribute name="nextDepreciationAmount" type="BigDecimal" mode="OUT" optional="true"/>
<attribute name="plannedPastDepreciationTotal" type="BigDecimal" mode="OUT" optional="true"/>
</service>
- <service name="createFixedAssetTypeGlAccount" engine="simple" default-entity-name="FixedAssetTypeGlAccount"
- location="component://accounting/script/org/ofbiz/accounting/fixedasset/FixedAssetServices.xml" invoke="createFixedAssetTypeGlAccount" auth="true">
+
+ <service name="createFixedAssetTypeGlAccount" default-entity-name="FixedAssetTypeGlAccount" engine="entity-auto" invoke="create" auth="true">
<description>Create a Fixed Asset Type Gl Account Mapping</description>
<permission-service service-name="fixedAssetPermissionCheck" main-action="CREATE"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
- <attribute name="fixedAssetTypeId" type="String" mode="IN" optional="true"/>
- <attribute name="fixedAssetId" type="String" mode="IN" optional="true"/>
+ <attribute name="fixedAssetTypeId" type="String" mode="IN" optional="true" default-value="_NA_"/>
+ <attribute name="fixedAssetId" type="String" mode="IN" optional="true" default-value="_NA_"/>
<attribute name="organizationPartyId" type="String" mode="IN" optional="false"/>
</service>
<service name="deleteFixedAssetTypeGlAccount" default-entity-name="FixedAssetTypeGlAccount" engine="entity-auto" invoke="delete" auth="true">
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_invoice.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_invoice.xml?rev=1652969&r1=1652968&r2=1652969&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_invoice.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/servicedef/services_invoice.xml Mon Jan 19 11:50:29 2015
@@ -298,8 +298,7 @@ under the License.
<attribute name="invoicedTotal" type="BigDecimal" mode="OUT" optional="false"/>
</service>
- <service name="updateInvoiceItemType" engine="simple" default-entity-name="InvoiceItemType"
- location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="updateInvoiceItemType">
+ <service name="updateInvoiceItemType" default-entity-name="InvoiceItemType" engine="entity-auto" invoke="update">
<description>Update Invoice Item Type Record</description>
<auto-attributes mode="IN" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
@@ -309,14 +308,14 @@ under the License.
<description>Scheduled service to generate Invoice from an existing Invoice</description>
<attribute name="recurrenceInfoId" mode="IN" type="String" optional="false"/>
</service>
-
+
<service name="cancelInvoice" engine="simple"
location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="cancelInvoice">
<description>Cancel Invoice</description>
<attribute name="invoiceId" type="String" mode="IN" optional="false"/>
<attribute name="invoiceTypeId" type="String" mode="OUT" optional="false"/>
</service>
-
+
<service name="getInvoiceRunningTotal" engine="simple"
location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="getInvoiceRunningTotal" auth="true">
<description>calculate running total for selected Invoices</description>
@@ -324,7 +323,7 @@ under the License.
<attribute name="organizationPartyId" type="String" mode="IN" optional="true"/>
<attribute name="invoiceRunningTotal" type="String" mode="OUT" optional="false"/>
</service>
-
+
<service name="addtax" engine="simple"
location="component://accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml" invoke="addtax">
<description>Call Tax Calculate Service</description>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1652969&r1=1652968&r2=1652969&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/webapp/accounting/WEB-INF/controller.xml Mon Jan 19 11:50:29 2015
@@ -62,6 +62,12 @@ under the License.
<response name="success" type="view" value="EditBillingAccount"/>
<response name="error" type="view" value="EditBillingAccount"/>
</request-map>
+ <request-map uri="createBillingAccountAndRole">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="createBillingAccountAndRole"/>
+ <response name="success" type="view" value="EditBillingAccount"/>
+ <response name="error" type="view" value="EditBillingAccount"/>
+ </request-map>
<request-map uri="updateBillingAccount">
<security https="true" auth="true"/>
<event type="service" invoke="updateBillingAccount"/>