Commit Graph
175 Commits
Author SHA1 Message Date
Suraj Khurana 443bac5d8f Improved: Added support for Inventory (Supply) Allocation Planning.
(OFBIZ-10518)
Thanks Deepak Nigam for initiating this feature and providng the patches, Arun Patidar for review and Swapnil Shah for design discussions.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1858270 13f79535-47bb-0310-9956-ffa450edef68
2019-04-27 13:05:30 +00:00
Suraj Khurana ec859eb0ca Improved: Verify contact mech details (expired or not) before copying it to new order while re-ordering.
(OFBIZ-9544)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1836882 13f79535-47bb-0310-9956-ffa450edef68
2018-07-28 09:32:05 +00:00
Rishi Solanki 7d29cd1888 Implemented: Add ability to record Return Communication. Added support to record communication event against return. Added new entity CommunicationEventReturn, crund and supporting screens. Also added support in the existing email services to handle the return cases.
(OFBIZ-9911)
Thanks to Ratnesh Upadhyay for your contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1821486 13f79535-47bb-0310-9956-ffa450edef68
2018-01-18 11:34:01 +00:00
Jacques Le Roux ab855f7774 Fixed: Sales by Store report calculates Value Sold incorrectly
(OFBIZ-9958)

Sales by Store report calculate Value Sold without taking into account order 
item quantity. 

jleroux: I also noticed that given products (free ones, due to^promotion) are 
counted as paid products, another thing to fix

Thanks: Oleg Andreyev

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1814277 13f79535-47bb-0310-9956-ffa450edef68
2017-11-04 11:36:25 +00:00
Deepak Dixit b15d57c11a Improved: Removed deprecated entities. (OFBIZ-9327)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1792176 13f79535-47bb-0310-9956-ffa450edef68
2017-04-21 10:31:59 +00:00
Deepak Dixit 834691742b (OFBIZ-6274) Renamed OFBiz artefacts from org.ofbiz.* to org.apache.ofbiz.*.Thanks to Taher for working on it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1752920 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 10:30:49 +00:00
Pranay Pandey 4d23e2d694 [OFBIZ-6328] Improved check on existing production runs for order so that createProductionRunsForOrder service considers cancelled production runs.
This service wasn't creating production runs whenever a WorkOrderItemFulfillment record exists even if workEffort.currentStatusId == "PRUN_CANCELLED". 

Thanks Christian Carlow for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1748387 13f79535-47bb-0310-9956-ffa450edef68
2016-06-14 11:12:46 +00:00
Divesh Dutta 0d4ddca2be (OFBIZ-7047) Fixed: Un-shipped sales orders are getting listed for returns while creating sales return for another matching address order, now only thoes orders are shown which are partially shipped or completely shipped. Thanks Swapnil Shah for reporting the issue and Jagpreet Kaur for the patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1742711 13f79535-47bb-0310-9956-ffa450edef68
2016-05-07 13:35:35 +00:00
Jacopo Cappellato 85b2008053 OFBIZ-6760: Moved all entity definitions from the applications components into a new component named "datamodel".
This is a first step to refactor application components into independent parts that can be deployed when needed.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1720413 13f79535-47bb-0310-9956-ffa450edef68
2015-12-16 18:37:22 +00:00
Jacques Le Roux 4584f05a32 A patch from Pierre Smits for "PartyRole Lifespan fields - Have QuoteRole entity work with the change" https://issues.apache.org/jira/browse/OFBIZ-6679
This adds the from an thru date to the QuoteRole entity

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1708969 13f79535-47bb-0310-9956-ffa450edef68
2015-10-16 12:09:56 +00:00
Arun Patidar 3865ff485d [OFBIZ-6171] Applied patch from Pierre Smits for replacing 'Open for Business' references with 'Apache OFBiz'.Thanks Pierre for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706589 13f79535-47bb-0310-9956-ffa450edef68
2015-10-03 14:15:21 +00:00
Shi Jinghai 75ed5abae9 OFBIZ-6555.
Removed issuedDateTime from OrderItemQuantityReportGroupByProduct view entity as it doesn't exist in ItemIssuanceQuantitySum.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1692458 13f79535-47bb-0310-9956-ffa450edef68
2015-07-24 04:46:30 +00:00
Divesh Dutta 5a15391319 [OFBIZ-4559] Fixed issue: InventoryWorker.getOutstandingProductQuantities returns inaccurate results when there are multiple ItemIssuances for an order, created new view entity called ItemIssuanceQuantitySum. This view entity will have sum of issued item grouped by orderItem of Order. Then this view entity is used in OrderItemQuantityReportGroupByProduct view entity instead of ItemIssuance entity. By doing this, we get accurate results.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1686651 13f79535-47bb-0310-9956-ffa450edef68
2015-06-20 16:28:21 +00:00
Deepak Dixit fcbf5ce772 Moved parentCustRequestId relationship for CustRequest entity from order/entitymodel.xml to scrum/entitymodel.xml, as parentCustRequestId defined in scrum component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1667483 13f79535-47bb-0310-9956-ffa450edef68
2015-03-18 10:33:39 +00:00
Jacopo Cappellato 99b7f462f2 Refactoring of Visit/Visitor/ServerHit* (and related) entities in order to be able to maintain them in a database separate from the main transactional database:
1) removed foreign key relationship from/to this group of entities and the other entities of the OFBiz data model; the fields are still available but they are not enforced by a foreign key constraint
2) removed one view entitiy joining Visit with Party entities and refactored the code that was using it in order to provide the same behavior
3) added a new entity group ("org.ofbiz.stats") for the Visit/Visitor/ServerHit* (and related) entities; for now the group is not active so that the entities are still in the same database as before; however assigning them to a different database is now a matter of uncommenting the group file definition in framework/webapp/ofbiz-component.xml and provide the new datasource definition
 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1647271 13f79535-47bb-0310-9956-ffa450edef68
2014-12-22 09:19:33 +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
Hans Bakker a847b48b07 reverted unwanted change in r1524279
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1524336 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 08:30:20 +00:00
Hans Bakker 557894d331 chanmge title relation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1524279 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 02:52:31 +00:00
Hans Bakker 707a96401e missing reference in custRequest for parentCustRequestId field
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1523959 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 09:03:44 +00:00
Jacques Le Roux 8a6324862b No functional changes: remove useless/confusing comments, replace tabs by spaces (from commit r1519544)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1522670 13f79535-47bb-0310-9956-ffa450edef68
2013-09-12 17:24:00 +00:00
Jacques Le Roux 3e8b20aa81 A patch from Parimal Gain for "Order Report Issue" https://issues.apache.org/jira/browse/OFBIZ-5297
Reports under Order component has following issues -
1. Following reports are not showing any records due some issue
   a. Last three month sales report.
   b. Sales report.
   c. Sales Order discount code report.
   d. Product demand report.
2. Inconsistency in opening the pdf report - some reports are opening in new tab window but some are in the same window.

Following are the checkpoint -
1) Order should be Approved
2) All Dimension table(CurrencyDimension, DateDimension, ProductDimension)should have record.
3) After approval of order, order record should be created in 'SalesOrderItemFact' table. These is the OLAP table used to display data in reports.

Description -
1) If dimension table doesn't have records then following services should execute from service engine -
a) loadAllProductsInProductDimension
b) loadCurrencyDimension
c) loadDateDimension
2) Calling service to create record in 'SalesOrderItemFact' is updated into patch. On commit operation of service 'changeOrderItemStatus' if order item is approved then 'loadSalesOrderFact' service called through SECAS.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1519544 13f79535-47bb-0310-9956-ffa450edef68
2013-09-03 03:29:45 +00:00
Hans Bakker a47a06a4b1 when a sales order is completed and no payment is created, this will create a payment in the 'not paid' status which can be disabled in the accounting properties file, when it is a order in foreign currency it will use the same exchange rate as when will be used for the related invoice
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1494464 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 05:53:20 +00:00
Jacques Le Roux f7b662bc46 A patch from Nicolas Malin for "Entity-Auto Engine : manage [create|lastModified]Date field" https://issues.apache.org/jira/browse/OFBIZ-5010
When a entity have fields createDate, lastModifiedDate, createByUserLogin and updateByUserLogin, the entity-auto engine set them.

Also makes all entities that have one of fields [create|lastModified][Date|ByUserLogin] to be consistent and have four fields

Impacted entityies:

    [Quote|Order|Return]Adjustment
    OrderPaymentPreference
    AcctgTrans
    GlReconciliation
    ValueLinkKey


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1407578 13f79535-47bb-0310-9956-ffa450edef68
2012-11-09 18:26:19 +00:00
Hans Bakker 9f63d1256f fix the grouporder tests
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1368889 13f79535-47bb-0310-9956-ffa450edef68
2012-08-03 11:14:03 +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
Ashish Vijaywargiya 7318b2fae0 Applied patch from jira issue OFBIZ-4703. In SupplierProduct entity, the type of the attribute 'supplierProductId' is id-long. But in OrderItem entity, the type of supplierProductId is id. This differs the size of the field in both entites which results in error while creating purchase order.
Provided the patch to resolve this bug.
Thanks Suprit. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1290891 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 22:09:34 +00:00
Hans Bakker 7c7227d2f2 Added field nextActionDate to Sales Opportunity, moved all opportunity and related (view) entities from the order to the marketing component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1206676 13f79535-47bb-0310-9956-ffa450edef68
2011-11-27 07:33:35 +00:00
Hans Bakker 07e8f327e5 another warning about a view in the startup log
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1176230 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27 06:44:08 +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 2dc94f4372 added a new accounting configuration option to generate invoice per order or per shipment. can be overridden at the order level
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1163083 13f79535-47bb-0310-9956-ffa450edef68
2011-08-30 04:11:16 +00:00
Adrian Crum 3dcb375095 Added notes to quotes. Patch contributed by Anne Jessel (https://issues.apache.org/jira/browse/OFBIZ-4370) with some changes by me.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1160402 13f79535-47bb-0310-9956-ffa450edef68
2011-08-22 19:47:58 +00:00
Ashish Vijaywargiya f609877552 Applied patch from jira issue - OFBIZ-4343.
When user tries to apply the specified promotion then following problem occurs;
1) Promotion is not applying for the customer, that means customer do not get the discount even if any promotion of such kind exists for the user.
1.1) To fix the above will need to add group-by clause to 2 more fields orderTypeId and statusId of view entity OrderHeaderAndRoleSummary as these fields do not have any values to check the condition, as group-by clause do not allow to show them if values are different.
2) After fixing the issue explained in #1, if user pass the other_value as 12 (month) and condVlaue as $ 1000.00, then after $ 1000 if user order history is of $ 900. Then it will pass the check and then user is allow to get discount on any number on the last order.
3) That means even if the limit is 1000 user is able to purchase in discount of 900 + 300 >> 1200 amount with complete discount. So before checking for the total amount on order history now system will check for "order history + cart sub total".

Thanks Rishi for the contribution!

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1148180 13f79535-47bb-0310-9956-ffa450edef68
2011-07-19 05:40:36 +00:00
Adam Heath 2343d4aee3 FIX: Correct several typos in various description fields.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1144107 13f79535-47bb-0310-9956-ffa450edef68
2011-07-08 00:38:27 +00:00
Andrew Zeneski 4b8b77c4f5 added modifiedPrice field to ShoppingListItem to allow shopping lists to be used to stage orders when a shopping cart object is not available
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1091525 13f79535-47bb-0310-9956-ffa450edef68
2011-04-12 18:05:12 +00:00
Hans Bakker fc625f71d2 remove log messages from image managment, correct sales report and popular categories
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1068279 13f79535-47bb-0310-9956-ffa450edef68
2011-02-08 07:10:36 +00:00
Hans Bakker 39408b7951 add quoteterm fields to be the same as ordeterm fields, add maintenance screens to the quote, copy quoteterms to orderterms when creating order from quote
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1067840 13f79535-47bb-0310-9956-ffa450edef68
2011-02-07 01:56:53 +00:00
Vikas Mayur 195b458d3b Bug fix - If an order placed with a billing account is edited then the billing account amount under payment section on order detail page wasn't updated to the new order amount.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1056686 13f79535-47bb-0310-9956-ffa450edef68
2011-01-08 10:34:58 +00:00
Vikas Mayur fc05e626ce Bug fix - Added group-by clause on OrderPaymentPreference.statusId field on OrderPurchasePaymentSummary view so that the max amount is summed up according to the status.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1056669 13f79535-47bb-0310-9956-ffa450edef68
2011-01-08 09:07:40 +00:00
Hans Bakker ca5b09bc7a add a popular categories section to the ecommerce frontpage which is generated from the data warehouse of real orders. Also adjusted the sales reports from the data warehouse by week/month/year. Demo data included is for display only
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1055774 13f79535-47bb-0310-9956-ffa450edef68
2011-01-06 07:37:45 +00:00
Ashish Vijaywargiya c6be405cee First pass, adding new entity ReturnContactMech that will help us to store and fetch the correct values for email, phone & address for the new exchange order. Providing service definition and its implementation.
Adding conditional check for adding "ORDER_EMAIL" for the newly created party from the ecommerce store. This check is added because you couldn't see the party's email that has been provided at the time of checkout if you update party's email from Order View page. It may happen that you wanted to use the same email address again if that email wouldn't get expired. 

Work done by me & Amit.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1054599 13f79535-47bb-0310-9956-ffa450edef68
2011-01-03 12:53:29 +00:00
David E. Jones 463c300fc5 Implemented alternative way of saving ProductPrices with tax included in the price, and then calculating VAT tax as an exclusive instead of inclusive amount that goes on a new field on OrderAdjustment; also added a method to OrderReadHelper to get tax for display; there are various changes to service descriptions and entity fields to describe these changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1042542 13f79535-47bb-0310-9956-ffa450edef68
2010-12-06 08:05:44 +00:00
David E. Jones 44844b52fc Changed unitPrice to currency-precise so that 3 digit price values will carry over to the OrderItem, otherwise calculation totals in the cart and earlier totals won't match the final order total
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1030845 13f79535-47bb-0310-9956-ffa450edef68
2010-11-04 07:05:34 +00:00
Adam Heath f8f89ac3c8 Add ReturnHeader.supplierRmaId, an informational header, to provide a
field to support tracking of rmas by suppliers.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@995201 13f79535-47bb-0310-9956-ffa450edef68
2010-09-08 19:03:12 +00:00
Adam Heath ac2299c50e Fix a bunch of no final newline issues.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965918 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 17:15:21 +00:00
Jacques Le Roux 8cf49bf87d The Sales by Store Report was wrong has it did not use a complex alias for quantityOrdered (OrderItem.quantity - OrderItem.cancelQuantity) but only OrderItem.quantity. Thus canceled quantities were not taken into account.
A little drawback is that if there are 0 values sold this values show. But actually it's not a problem since it informs the user that all quantities ordered for this product has been canceled

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@958343 13f79535-47bb-0310-9956-ffa450edef68
2010-06-27 07:42:46 +00:00
Jacques Le Roux 6193dd4e53 <author>None</author> is totally useless and we don't need an author OOTB
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@949101 13f79535-47bb-0310-9956-ffa450edef68
2010-05-28 05:41:23 +00:00
Jacques Le Roux 63fd94e778 Not sure why, but my regexp S/R in the commit r948846 boke some formatting. I also removed some useless other stuff in this commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@948852 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27 14:45:59 +00:00
Jacques Le Roux 2a1a5aee14 We don't need
<copyright>Copyright 2001-.* The Apache Software Foundation</copyright>
<copyright><year>.*</year><holder>Apache Foundation</holder></copyright>
<copyright><year>.*</year><holder>Apache Foundation.</holder></copyright>
<owner>Copyright 2001-.* The Apache Software Foundation</owner>

Less to update every year!

Thanks to BJ 1st effort at "update files from 2009 to 2010" (https://issues.apache.org/jira/browse/OFBIZ-3783) - OFBIZ-3783

Note: there are been a lot of efforts in 2009: there are plenty of data dated from this year!

I hope I did not broke anything (should not, but of course I did not try all changes...) Anyway, this can be easily reverted...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@948846 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27 14:23:22 +00:00
Jacques Le Roux 21ec172143 A patch from Sam Hamilton "Extending the search when receiving a Purchase Order" (https://issues.apache.org/jira/browse/OFBIZ-3777) - OFBIZ-3777
This patch is to add a couple of extra ways to look for a purchase order when receiving it into a facility

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@948020 13f79535-47bb-0310-9956-ffa450edef68
2010-05-25 12:17:09 +00:00
Vikas Mayur 6aa85b0518 Fixed an issue with grouping of order on picking screens. Earlier when user selects any grouping methods (except zero grouping which means user has not selected any
grouping methods) then the Find Orders to Pick screen wasn't showing any thing if the FacilityLocation (Warehouse Area) is not setup in the system.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@944605 13f79535-47bb-0310-9956-ffa450edef68
2010-05-15 09:55:32 +00:00