Renames respectively blacklist and whitelist to denylist and allowlist in
several places.
There are still a lot of master word which can be replaced by main, but not in
contexts where slave is also used. I'll discuss that on dev ML again...
Provides the migrateOldOrderBlacklistAndOldOrderBlacklistType service to migrate
records from OrderBlacklist and OrderBlacklistType entities to new OrderDenylist
and OrderDenylistType entities
(OFBIZ-11435)
Also, added deprecated since tag in some old entities and fields. This is done as per current policy to deprecate entities/services.
Thanks Pierre for reporting and Jacques for review.
* Improved: Enhance entity "GlXbrlClass" and use
(OFBIZ-10613)
Adding field parent of the GlXbrlClassId
Application of field in appropriate forms
* Improved: Added new field parentGlXbrlClassId into DATAMODEL_CHANGES.md
(OFBIZ-10613)
Co-authored-by: Pawan Verma <pawan.verma@hotwaxsystems.com>
(OFBIZ-9909)
This will generate the report with positive visits only in both the cases (with/without date filter) while running marketing campaign reports.
Thanks Rubia for reporting and Ankit Joshi for providing the patch.
* Fixed: Specified key was too long; max key length is 767 bytes for ProductPromoCodeEmail entity.
(OFBIZ-5426)
The problem is in the entity model. An email address should not be used in the primary key - mainly because an email address is case-insensitive. A better design would be to use the email address contact mechanism ID in the primary key.
Done Following:
1. Changed Entity Name from ProductPromoCodeEmail to ProductPromoCodeContMech
2. Related Changes for the entity name change
3. Migration service to migrate old data
Thanks, Leon for the report and Adrian Crum, Jacques Le Roux, Ingo Wolfmayr, Deepak Dixit, Pierre Smits and Gil Portenseigne for the discussion and review.
* Improved: Added new line in service definition file and lincence in MigrationServices file.
(OFBIZ-5426)
Thanks, Jacopo for the review.
entity
(OFBIZ-11218)
I see no reason to no have it as it's in all other cases.
Thanks: reported by Rajesh Mallah, improved with a patch from Devanshu Vyas.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1867665 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10636)
services converted:
* createPicklist
* updatePicklist
* deletePicklist
* createPicklistBin
* deletePicklistBin
* createPicklistItem
* updatePicklistItem
* updatePicklistItem
* deletePicklistItem
* createPicklistRole
* deletePicklistRole
Entity Picklist received to new field createdDate and lastModifiedDate
that needed to support automatic setting of createdByUserLogin natevily
by entity auto engine
Thanks to Pallavi Goyal for this issue and Suraj Khurana for the remind.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1866561 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-11182)
The entity PicklistStatusHistory record each status change realized on picklist.
It can't be convert to entity-auto easily because PicklistStatusHistory's fields pattern
doesn't follow same entities like ShipmentStatus and PartyStatus.
To solve this issue, I deprecate PicklistStatusHistory and move it to OldPicklistStatusHistory
and replace it by new entity PicklistStatus that can use natively with entityauto.
I added a new migration service migrateOldPicklistStatusHistoryToPickListStatus to forward all
picklist status history to new entity.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1866558 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10150)
During some data migration I hit an issue where my data for supplierProductId
was too long. So I looked up the fields and noticed that the order item entity
had a different type for the field than the supplier product entity.
jleroux: we should do it for all cases
Thanks: jesse thomas for report and Rohit Hukkeri for the fix
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1862271 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-11028)
Arpit Mor: steps to regenerate:
Login to the URL: https://demo-trunk.ofbiz.apache.org/humanres/control/main
Click on Employments
Click on New Employments
Click on Create
Actual: Error message is displayed.
Olivier Heintz: employment is associated with PayHistory, and there is a problem
in PayHistory entity definition in OFBiz,
In PayHistory, the field fromDate from Employment is confused with fromDate
about the current record.
A Employment can have multiple PayHistories and should have multiple
because PayHistory should show history of Pay for a employment !
It's necessary to have a field emplFromDate (to have the complete employment
primaryKey).
When modifying a PayRecord the current should be expire and a new one should
be created.
Thanks: Arpit Mor for report at OFBIZ-10969 and Olivier Heintz for the fix
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1859571 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10761)
Remove deprecated entity fields deprecated for more 10 years and without impact with source code
Add since deprecate release on comment for PartyAcctgPreference definition and demo data to help the next analyse
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1850182 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10721)
stats related entities foreign key relation has been removed by Jacopo at r#1647271 and new group org.apache.ofbiz.stats introduced for stats related entity. Some remnants were still left in stats entities.
Removed relations of Party, ContactMech and Content from ServerHit entity.
Removed relations of Content from ServerHitBin entity.
Removed relations of UserLogin from Visitor entity.
Thanks Jacques Le Roux and Deepak Dixit for the review.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1849275 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10372)
Currently when you pass an order in ofbiz you can select the shipment method to delivery finish good and obtains an amount cost but you have nothing to indicate how the delivration will during.
We have a good example with ship by plane or boat and for road the time is different between the Portugal to Spain and Portugal to Slovenia.
With this information, we can planned the estimated delivery date with the estimated date to produce finish good and the time to delivery them
To fill this gap, we introduce a new entity ShipmentTimeEstimate modelled as ShipmentCostEstimate to define the estimated time for a shipment method, a carrier and two geo location.
During the entry order process, if you select a shipmentMethod, a carrier and geoIds that match a ShipmentTimeEstimate, when you create the order, OFBiz try to resolve the an estimated delivery date from estimatedShipDate, shipBeforeDate, shipAfterDate or now.
Thanks Leila Mekika for initialize this works, Gil Portenseigne for improve the solution and Suraj Khurana for the review
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1840579 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10540)
I introduced two waring on log with the commit OFBIZ-10514 (Refactoring ContactMechWorker.get[Entity]ContactMechValueMap)
Thanks to Deepak Nigam to raise and correct it
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1839965 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10534)
While creating orders from the backend, we have the option to set parameters
like 'Ship After Date' and 'Ship Before Date' to manage the fulfilment cycle
more efficiently.
Inventory gets reserved for the product based on a FIFO basis. Sometimes the
fulfilment time for the order is high and inventory unnecessarily gets locked
for some time period.
We can introduce a new parameter (at order item level) 'Reserve After Date'
which will indicate the date only after which reservation can happen.
In this way, we can manage the stock availability more efficiently.
This issue relates to OFBIZ-10518
Thanks: Deepak Nigam for the effort, Deepak Dixit for a review and suggestions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1839914 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10514)
ContactMechWorker.get[Entity]ContactMechValueMaps are old historic functions that resolve all contact mech context related to an Entity (Party, Facility, Order, WorkEffort).
The problem that they create too many db call during their execution that decrease OFBiz performance when the contactMech history grow.
A solution use to improve the process speed was replace all db call through *GenericValue.getRelated* function by *Delegator.makeValidValue* to instanciate each GenericValue needed after an unique search call on a viewEntity. For the four entities : Party, Facility, Order and WorkEffort, I use the same view structure with a sub view entity on ContactMechDetail. This offer more genericity and permit to slim code.
This commit introduce a regression on genericValue resolved for ContactMechType and ContactMechPurposeType that currently lost their description, it's actually not awkward because theses genericValue use the function .get("description", locale) to resolve the description so call directly the label system.
For Order and WorkEffort, I merged the resolving process in one function, that can be extend later easily for some other entity like Invoice or Quote.
The new FtpAddress wasn't managed by this worker so I introduce it to keep the coherence.
Last improvement, I use
getPartyContactMechValueMaps(Delegator delegator, String partyId, Timestamp date, String contactMechTypeId)
instead of
getPartyContactMechValueMaps(Delegator delegator, String partyId, boolean showOld, String contactMechTypeId)
to offert also more possibility to resolve at date instead just use now or all.
icing on the cake, I added groovy test to control this worker
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1838349 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10249)
In some country (like european) you need to indicate on your sales invoice where you ship the finish good product related.
To help this case, I added a new worker function (InvoiceWorker.getShippingAddress) to found information from an invoice and improve the generic EditInvoice.groovy and the invoice ftl template to display it as example.
To homogenize postal address displaying with order I use the subscreen PartyScreens.xml#postalAddressPdfFormatter on the invoice ftl template
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1835028 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10245)
This commit introduce a new way to manage file transfer in OFBiz.
Inspired by mailing communication event management, a new communicationEventTypeId is created ('FILE_TRANSFER_COMM').
Such commEvent with classics : partyIdFrom/partyIdTo/contactMechIdTo/entryDate etc. are analysed by a job (like sendEmailDated), to send associated contents to a configured FTP/SFTP/FTPS server. If failure happens, it is catched and stored in communicationEvent, waiting for a new try.
For this purpose :
A new contactMechTypeId is introduced (FtpAddress), with its corresponding table. This contactMech store needed information for basic user/password authentication (server url and protocol, port, username, password, etc.)
A new service sendFileTransferDated that will look for pending file transfer and call following service.
A new service sendCommEventAsFtp that take a selected commEvent, check its structure and manage its status after trying the associated content file transfers.
A new service sendContentToFtp, that take a content and transfer it to a given FtpAddress.
A seca createCommEventFromFtpTransfer on sendContentToFtp to manage plural content file transfer, creating children communicationEvent to follow each content transfer separately (only for several content transfers).
A new Interface FtpClientInterface, with the 3 implementations of FTP, FTPS (To Implement), SFTP clients to manage Ftp connection and transfer.
A new property file to enable and manage redirection for testing purpose.
With this implementation, creating a communicationEvent, with a FtpAddress contactMechIdTo, and sendFileTransferDated job planned, the file is transfered to the ftp : communication event status set to COM_COMPLETE, if error occured the communication event status is set to COM_BOUNCED with error message on communicationEvent note.
Thanks Rishi for your feedbacks
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1831867 13f79535-47bb-0310-9956-ffa450edef68
(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
(OFBIZ-10369)
The events contained in the controller configuration for first-visit, pre-post processor and before-after login are executed in arbitrary order rather than the defined order.
If we define an event configuration as follow:
<after-login>
<event name=keepCartUpdated type=java path=org.apache.ofbiz.order.shoppingcart.ShoppingCartEvents invoke=keepCartUpdated/>
<event name=restoreAutoSaveList type=java path=org.apache.ofbiz.order.shoppinglist.ShoppingListEvents invoke=restoreAutoSaveList/>
<event name=saveCartToAutoSaveList type=java path=org.apache.ofbiz.order.shoppinglist.ShoppingListEvents invoke=saveCartToAutoSaveList/>
</after-login>
We wait that OFBIz run keepCartUpdated, restoreAutoSaveList and after saveCartToAutoSaveList event but the HashMap who organise them return arbitrary order and can return saveCartToAutoSaveList, keepCartUpdated and restoreAutoSaveList. Convert the HashMap to LinkedHashMap help to keep the loaded order.
Thanks to Vikas Mayur for solve this issue
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1830301 13f79535-47bb-0310-9956-ffa450edef68
Extend the drop shipment process to manage an agreement for the supplier related to the order context.
For a supplier we have different agreements with same products but on different prices
Agreement A
GIZMO-1 100€
GIZMO-1 110$
Agreement B
GIZMO-1 90€
Agreement C
GIZMO-1 600¥
During sales order process we resolve the purchase agreement that match the case and put on OrderItemShipGroup related to the supplier. Like that when the drop shipment process run it to resolve the product price for the agreement present on the OrderItemShipGroup. With this implementation we have an adaptable system to manage complex case.
Properly this patch implemented :
an attribute on entity OrderItemShipGroup.supplierAgreementId
an attribute on entity OrderHeader.agreementId (necessary when you update the order to keep the price)
update the service caculatePurchasePrice for resolve the price from a agreement if it's present
update the shoppingCart to insert a purchase agreement
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1825002 13f79535-47bb-0310-9956-ffa450edef68
With this entity we can link a customScreen with an organisational party for a document type like salesinvoice, product quote and so on.
I added screen, form and menu to manage them on the organisation party configuration page accounting/control/ListCompanies
Currently this isn't useful alone but needed for issues OFBIZ-10215, OFBIZ-10216, OFBIZ-10217 that will be completed soon
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1824436 13f79535-47bb-0310-9956-ffa450edef68
sub classes
(OFBIZ-10209)
Arun:
Most "liquid" assets should be first (i.e Bank/Cash before Inventory) so need
to provide support to sort GLAccount classes.
Add seqId to GlAccountClass entity to support the sorting of GLAccount sub
classes.
Suraj:
Also rearranged GlAccountClass data in a logical grouping for better readability
Jacques:
I counted 35 lines GlAccountClass moved, did not check each line
Thanks: Arun Patidar for report and Suraj Khurana for the patch
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1823737 13f79535-47bb-0310-9956-ffa450edef68
(OFBIZ-10040)
Creates a new entity facilityCalendar which will create the one-to-many
relationship between facility and calendar. Here are the entity attributes:
*FacilityCalendar*
* facilityId*
* calendarId*
* facilityCalendarTypeId*
* fromDate*
* thruDate
*FacilityCalendarType*
* facilityCalendarTypeId*
* parentTypeId
* description
A calendar will be used to store opening time, closing time, working weekdays
and all this type of stuff.
For further information please refer
http://ofbiz.markmail.org/message/nectwaze6ina7y6z
Thanks: Vaibhav Jain for the initial proposition and all people who participated
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1817347 13f79535-47bb-0310-9956-ffa450edef68