Commit Graph
187 Commits
Author SHA1 Message Date
holivier 302bc0eb15 Documented: migration to help system using asciidoc files (OFBIZ-11587)
Remove all related help docbook files
2020-10-26 17:34:03 +01:00
holivier 63daf25112 Documented: migrate help link to asciidoc user manual for Product
(OFBIZ-11587)

All files have been migrated to asciidoc format and help link now point
to the html file generated from the asciidoc files

In the global Help Docbook index tree, remove all points about
Product & Facility and add a short page with a link to the new help

Remove docbook help files for Product & Facility
2020-07-14 16:19:48 +02:00
Nicolas Malin a3c1177bc8 Improved: Migrate product promotion condition and action rule on SOA
(OFBIZ-10370)

Currently promotion rule engine works with :
    entities ProductPromoCond et ProductPromoAction
    java linear function ProductPromoWorker.checkCondition() (ProductPromoWorker:910) and ProductPromoWorker.performAction (ProductPromoWorker:1423)
    Enumeration list to indicate on java function what piece of code to activate the control or action

The problem with this structure is when you want to create a new case of condition or action, you need to modify the framework code base.

We convert the 2 big java leaner function to service representation with one service by case. To realize it we introduce a relation with CustomMethod :
  ProductPromoRule --> ProductPromoCond   -> CustomMethod
                    -> ProductPromoAction -> CustomMethod
Each functions's case are converted to service with a related CustomMethod.
With this pattern now you can write your own condition rule and action rule on your plugin and link it on the promo engine

For backward compatibility purpose, current "PPIP" enumeration entries receive in enumCode data the new corresponding customMethodId reference, to ensure that old data works fine with the new engine
on EntityData
 <CustomMethod customMethodId="PPC_PRODUCT_AMOUNT" customMethodTypeId="PRODUCT_PROMO_COND" customMethodName="productPromoCondProductAmount" description="Product amount"/>
 <Enumeration enumId="PPIP_PRODUCT_AMOUNT" enumCode="PPC_PRODUCT_AMOUNT"/><!--link enumeration with customMethod for backward compatibility-->
on Java
 //for backward compatibility resolve customMethodId from enumCode
 GenericValue condEnum = EntityQuery.use(delegator).from("Enumeration").where("enumId", inputParamEnumId).cache().queryOne();
 if (condEnum != null) {
     customMethod = EntityQuery.use(delegator).from("CustomMethod").where("customMethodId", condEnum.get("enumCode")).cache().queryOne();
     if (customMethod == null) {
         Debug.logWarning("The oldest enumeration " + inputParamEnumId + " for promo " + productPromoCond.getPkShortValueString() + " haven't the new customMethod to use, please check your data or load seed data", module);
         return false;
     }
     serviceName = customMethod.getString("customMethodName");
 }

Many thanks to Ziri Khalifa and Leila Mekika for their helping work

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1831783 13f79535-47bb-0310-9956-ffa450edef68
2018-05-17 14:03:46 +00:00
Jacques Le Roux 0940288cba Fixed: rename the common-theme component directory
(OFBIZ-10175)

Some of the remnants were still left. I got stuck with 
JsLanguageFileMappingCreator, so changed other left outs too.

This also fixes OFBIZ-10113  - Replace Asm select plugin with Select2.

Thanks: Aditya

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1823826 13f79535-47bb-0310-9956-ffa450edef68
2018-02-11 09:46:53 +00:00
Rishi Solanki b8889e7f6f Improved: Move all data in applications to the datamodel component. Removed unused files as no data in it.
(OFBIZ-9501)
Thanks Sourabh Jain for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1823182 13f79535-47bb-0310-9956-ffa450edef68
2018-02-05 14:39:43 +00:00
Rishi Solanki 5a49b98d3a Improved: Move all data in applications to the datamodel component. Moved demo data from accounting, commonext, content, humanres, manufacturing, marketing, order, party, product, workeffort components to datamodel component. Done changes in related data files and do entries accordingly.
(OFBIZ-9501)
Thanks to Sourabh Jain for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1823177 13f79535-47bb-0310-9956-ffa450edef68
2018-02-05 14:13:04 +00:00
Rishi Solanki 90acab80c7 Improved: Move all data in applications to the datamodel component. Remove unused files.
(OFBIZ-9501)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817015 13f79535-47bb-0310-9956-ffa450edef68
2017-12-03 06:31:10 +00:00
Rishi Solanki be307fbade Improved: Move all data in applications to the datamodel component.
(OFBIZ-9501)
Move selected seed data for Product, Accounting and Manufacturing component. Thanks to Taher and Jacques for finalizing the data set.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1816948 13f79535-47bb-0310-9956-ffa450edef68
2017-12-02 13:18:01 +00:00
Deepak Dixit 2a8a37f308 Improved: Manage life span of SecurityGroupPermission entity.
Applied patch from jira issue(OFBIZ-9801) Thanks Suraj Khurana for your contribution


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1812383 13f79535-47bb-0310-9956-ffa450edef68
2017-10-17 10:47:47 +00:00
Arun Patidar 580c40eedc FIXED: Fix type entities to follow convention of hasTable.(OFBIZ-9696)
Thanks Aman Agrawal for your contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809396 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 11:22:35 +00:00
Rishi Solanki 3d29d37572 Improved: Extend SecurityGroup entity and add name/groupName field. Added groupName field to entity SecurityGroup and related changes done in the data, services and UI. (OFBIZ-9620)
Thanks Suraj Khurana for your patch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809386 13f79535-47bb-0310-9956-ffa450edef68
2017-09-23 10:16:17 +00:00
Rishi Solanki d5eb2cee42 Improvement: Move all data in applications to the datamodel component. (OFBIZ-9501)
Moved the data which belongs to product with seed reader.
Thanks Saurabh Jain for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806267 13f79535-47bb-0310-9956-ffa450edef68
2017-08-26 07:39:19 +00:00
Nicolas Malin 15da786110 Implemented: Continue the common-theme upload (OFBIZ-9138 Create a common theme)
Second step, move all images and js library on the common-theme component and move the dedicate webapp image (for continuous compatibility)
The components image is removed from framework.

Warning this commit raise the problem that many images has been uploaded on the framework directory (properties image.server.path and image.management.path) and we need to found a solution to set them out static folder to a dynamic folder like runtime.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1806084 13f79535-47bb-0310-9956-ffa450edef68
2017-08-24 20:38:19 +00:00
Taher A. Alkhateeb 5275aaf233 Fixed: renamed help file that is missing an underscore
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1799779 13f79535-47bb-0310-9956-ffa450edef68
2017-06-24 20:19:32 +00:00
Taher A. Alkhateeb 1d6c5ffad1 Implemented: Removed most dependencies from OFBiz framework to plugins
(OFBIZ-9322)

This is the first commit to removed dependencies on the ecommerce plugin data
by moving the following files to applications:
- DemoStandardCosting to applications/accounting/data/
- DemoOrderPeopleData.xml to applications/order/data/
- DemoOrderTestData.xml to applications/order/data/
- DemoProduct.xml to applications/order/data/
- DemoRentalShipping.xml to applications/order/data/
- DemoShipping.xml to applications/order/data/

Also modified some data on the below files to fix dependency order
- applications/product/data/ProductDemoData.xml
  (move facility data needed for tests from plugins)
- applications/marketing/data/sfaDemoData.xml
  (move data to DemoOrderPeopleData.xml)
- applications/party/testdef/data/PartyTestsData.xml
  (status does not exist)
- applications/workeffort/testdef/data/WorkEffortTestData.xml
  (status does not exist)
- applications/workeffort/minilang/test/WorkEffortTests.xml
  (depends on planHours which is defined in project componnent)

And finally updated the below component files with the moved data
- applications/order/ofbiz-component.xml
- applications/accounting/ofbiz-component.xml


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1792866 13f79535-47bb-0310-9956-ffa450edef68
2017-04-27 11:39:04 +00:00
Jacques Le Roux 7ada24fd04 This removes the pos component. OFBIZ-7804 "Check if we should fix or remove the POS (hence WebPos?)"
Most is done already. Test pass but testFopMacroLibrary but I don't see how it could be related to these changes, could be a quirk on Windows, BuilBot will tell us. Anyway, I will later double-check to be sure, also to see if I did not miss anything else.

I have voluntarily left 2 or 3 moot points
I was unable to remove possible POS references in <property key="FieldDescription.ProductStore.isImmediatelyFulfilled"> for certain language I'm unable to read.
I have to check if we should keep or not this code snippet
                <!-- if inventory info is not available for all of the products, then don't do the issuance, ie there has to be at least SOME inventory info in the database to facilitate inventory-less POS terminals -->
                <entity-count entity-name="InventoryItem" count-field="iiCount">
                    <condition-expr field-name="facilityId" operator="equals" from-field="orderHeader.originFacilityId"/>
                </entity-count>
I simply commented out twice this snippet in InvoiceServices.java, because I wonder if it would not be useful when the webPos will be able to issue money change
//                if (null == adj.get("amount")) { // JLR 17/4/7 : fix a bug coming from POS in case of use of a discount (on item(s) or sale, sale here) and a cash amount higher than total (hence issuing change)
//                    continue;
//                }

While at it, since I modified OPTIONAL_LIBRARIES, I also changed these svn:properties: svn:eol-style = native & svn:mime-type = text/plain


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1754402 13f79535-47bb-0310-9956-ffa450edef68
2016-07-28 12:27:20 +00:00
Nicolas Malin 96ed02fae4 Create demo PartyStatus data for existing parties for applications component, thanks to Suraj Khurana for the submission through OFBIZ-7673
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1753797 13f79535-47bb-0310-9956-ffa450edef68
2016-07-22 14:22:32 +00:00
Jacopo Cappellato 02cf86f31e Removed the watermarker jar and the code that was dependent on it because Watermarker is a dead project and the jar is no more publicly available, so we will not be able to run it in releases.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751819 13f79535-47bb-0310-9956-ffa450edef68
2016-07-07 17:35:47 +00:00
Mridul Pathak 743bb0153e [OFBIZ-6940] Thanks Vishal Chhabria for your contribution and Jacopo for review.
New ProductPriceType 'SHIPPING_ALLOWANCE' and a new minimumPrice field in ProductStoreShipmentMeth entity.
========================================
New price type "SHIPPING_ALLOWANCE" can be used in the scenarios where default/list prices are comprehensive of the 'Shipping Cost' quota, this price type can help user to set the Shipping Allowance cost he has included in the the product's default/list price and then modify actual shipping cost by reducing the allowance cost from it.
minimumPrice field can be used to set the the lowest rate for a particular shipping type.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1748969 13f79535-47bb-0310-9956-ffa450edef68
2016-06-18 12:08:06 +00:00
Jacques Le Roux 1326c12156 A patch from Ankit Joshi for "http://docs.ofbiz.org/ is wrongly used in content" https://issues.apache.org/jira/browse/OFBIZ-7001
There are 31 occurrences and most use shortcuts. They should be converted to link to the current wiki, of course the previous shortcuts are no longer valid.
We need to replace them by hand, hence 1st find what the old shortcuts were, and then replace them with new shortcuts, or even better real links. We got bitten once by shortcuts, it's enough...


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1748260 13f79535-47bb-0310-9956-ffa450edef68
2016-06-13 15:23:37 +00:00
Mridul Pathak 04e0bca729 [OFBIZ-7008] Support to add condition for Geo Location in Promo Engine. Adding back the code reverted in r1739637 as the tests were failing. Thanks Vishal Chhabria for providing the updated patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1748186 13f79535-47bb-0310-9956-ffa450edef68
2016-06-13 12:02:27 +00:00
Deepak Dixit abeaeb2a58 (OFBIZ-6821) relocate .ftl files in the product component
Thanks Pierre for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1740477 13f79535-47bb-0310-9956-ffa450edef68
2016-04-22 10:34:35 +00:00
Jacques Le Roux 3ab4953e5a Modified patches from Pierre Smits for "Have configuration options for catalog webapp" https://issues.apache.org/jira/browse/OFBIZ-6192
These patches address the integration of CatalogSystemPropertyData.xml in the ofbiz-component.xml of the Product component, this is for the catalog webapp (based on catalog.properties)


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1739967 13f79535-47bb-0310-9956-ffa450edef68
2016-04-19 17:38:36 +00:00
Mridul Pathak 43f0fe2a34 Reverting r1739457 as tests does not pass.
[OFBIZ-7008] Support to add condition for Geo Location in Promo Engine.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1739637 13f79535-47bb-0310-9956-ffa450edef68
2016-04-17 19:07:21 +00:00
Mridul Pathak c497e160e0 [OFBIZ-7008] Support to add condition for Geo Location in Promo Engine. Thanks Vishal Chhabria for contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1739457 13f79535-47bb-0310-9956-ffa450edef68
2016-04-16 13:25:59 +00:00
Deepak Dixit 3d5b387f13 (OFBIZ-6699) Removed invalid field condition from StatusValidChange data.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1710566 13f79535-47bb-0310-9956-ffa450edef68
2015-10-26 11:09:54 +00:00
Arun Patidar 4f52380dca [OFBIZ-6171] Replacing 'Open for Business' references with 'Apache OFBiz'from remaining occurences.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706593 13f79535-47bb-0310-9956-ffa450edef68
2015-10-03 14:31:12 +00:00
Jacopo Cappellato 373e0aba28 Moved the "bi" component from the framework to the specialpurpose folder; moved all the dependencies (client code) on the "bi" component from applications components to the "bi" component itself.
Now the "bi" component contains all the dimensions/facts/star schemas and all the logic to populate them and can be easily enabled/disabled.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1642027 13f79535-47bb-0310-9956-ffa450edef68
2014-11-27 06:14:06 +00:00
Jacques Le Roux 5e194d1138 "Fix online help issues" https://issues.apache.org/jira/browse/OFBIZ-5320
A forgotten one

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1523436 13f79535-47bb-0310-9956-ffa450edef68
2013-09-15 14:27:48 +00:00
Jacques Le Roux c70c41921d "Fix online help issues" https://issues.apache.org/jira/browse/OFBIZ-5320
This fixes most of the issues but some are remaining, I report them in OFBIZ-5320

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1523423 13f79535-47bb-0310-9956-ffa450edef68
2013-09-15 09:41:28 +00:00
Erwan de Ferrieres 53913d4dbe A patch from Nicolas Malin - OFBIZ-5021 - Add screen to manage productStoreGroup Hierarchy
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1381093 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 09:19:53 +00:00
Hans Bakker bb74cd18fa improve the groupbuying function by properly return sales numbers when cancelling an order.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1368822 13f79535-47bb-0310-9956-ffa450edef68
2012-08-03 07:52:28 +00:00
Hans Bakker bd16dfb598 split up securitypermissions as seed data and securitygroups as demo data with a single exception: the creation of a super security group which has general access to the system and which is used with the 'ant create-admin-user-login' command.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1352431 13f79535-47bb-0310-9956-ffa450edef68
2012-06-21 07:21:49 +00:00
Hans Bakker 9607b08c5c Removed unused SHIPRATE_* security
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1351587 13f79535-47bb-0310-9956-ffa450edef68
2012-06-19 07:07:01 +00:00
Hans Bakker 14f4e5a292 reverted recent security file changes revisions: 1350847,1350843,1350840,1348534,1347908,1347213,1346264, need more investigation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1351206 13f79535-47bb-0310-9956-ffa450edef68
2012-06-18 04:36:20 +00:00
Hans Bakker 0eb0f553d1 split security for catalog and facility over 2 files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1347908 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 07:29:39 +00:00
Hans Bakker b93ec25b74 auto approve image function in catalog image management
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1292661 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 06:38:38 +00:00
Erwan de Ferrieres 72edce8da7 OFBIZ-4671 - Just a better description for PortletCategory PRODUCTS - A patch from Olivier Heintz
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1235928 13f79535-47bb-0310-9956-ffa450edef68
2012-01-25 20:36:40 +00:00
Hans Bakker a3633e042e changes for configurable service product:
1. Display the configuration button on a product on the catalog manager.
2. Check the config  if the product is the configurable product service then 
    create new product from config(Do the same step as the configurable product).


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1235698 13f79535-47bb-0310-9956-ffa450edef68
2012-01-25 09:01:53 +00:00
Hans Bakker 7cba52a8f2 improve imagemenagement: add an option to resize already uploaded images
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1233198 13f79535-47bb-0310-9956-ffa450edef68
2012-01-19 06:30:46 +00:00
Ashish Vijaywargiya 03f94dd0b2 Providing additional details inside GoodIdentificationType.description field for "HS Code" so that it will be easy for someone to understand its purpose.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1221669 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 10:43:20 +00:00
Jacopo Cappellato 4da09f109c Fixed typo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1220649 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 08:33:05 +00:00
Hans Bakker 121a671018 new producttype: configurable product service, using inventory
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1220622 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 06:40:18 +00:00
Jacques Le Roux 29a6669291 A patch from Sam Hamilton "Add support to save HS Code in Goods Identification" is not working." https://issues.apache.org/jira/browse/OFBIZ-4610
Add support to save the HS Code ( http://en.wikipedia.org/wiki/Harmonized_System ) in the system.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1215536 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 17:52:31 +00:00
Hans Bakker c3607815cd also allow analytics on the backend, and move analytics seed data from product to content
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1206052 13f79535-47bb-0310-9956-ffa450edef68
2011-11-25 03:27:08 +00:00
Erwan de Ferrieres 2f12ef83f2 Reducing PKs which were too long and then producing errors when inserting in db (>20 char.)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1195180 13f79535-47bb-0310-9956-ffa450edef68
2011-10-30 15:39:56 +00:00
Jacques Le Roux d2f50da17e A modified patch from Pierre TALLOTTE "Managing of lot number and tracking" https://issues.apache.org/jira/browse/OFBIZ-4172
This patch adds features which allows a, user to manage products by lot id :
    when s/he buys a product, s/he can specify the lot id ;
    each time s/he produces an inventory item in manufacturing, s/he can specify the lot id ;
    s/he can choose the lot s/he wants when s/he makes a sale order or a manufacturing process ;
    there is a new screen which allows the user to realize the tracking of lots.

jleroux: apart some formatting and typos, I used only availableToPromiseTotal (instead of also quantityOnHandTotal) when checking the stock of a lot while editing a Picklist Item. 
Note: I only reviewed the code, but did not find enough time to test. As the code was straightforward I decided to add it

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1195037 13f79535-47bb-0310-9956-ffa450edef68
2011-10-29 21:09:38 +00:00
Hans Bakker 483299c5ec New product type: Fixed Asset Usage For Rental of an asset which is shipped from and returned to inventory. Including Junit test and demo data. More explanation will follow in a blog on the 'what is new page'
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1167015 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 06:40:28 +00:00
Hans Bakker 38935cf7db New product type SERVICE_PRODUCT which was discussed in the mailing list. blog linked to the what is new file will be added later
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1166543 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08 07:07:07 +00:00
Hans Bakker 8f72b469be the help text was dependent on the websiteId which is now removed. changed it to the component name which is a better choice anyway
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1160101 13f79535-47bb-0310-9956-ffa450edef68
2011-08-22 03:35:18 +00:00