Commit Graph
79 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 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
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
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
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
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
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
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
Hans Bakker 601ca11233 add the note view to the customer request
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@925733 13f79535-47bb-0310-9956-ffa450edef68
2010-03-21 06:46:20 +00:00
Hans Bakker b6a334c615 changed view entities so there are no warnings of duplicated fields at start-up
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@895583 13f79535-47bb-0310-9956-ffa450edef68
2010-01-04 09:03:38 +00:00
Vikas Mayur 68dc9b9ec1 When items received against a PO are canceled, this also cancels the invoice. Added the ability to re-generate the invoice once canceled items are received again.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@796297 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 13:46:44 +00:00
Vikas Mayur eebe04dc4c Done following fixes:
1) Moved the view entity to correct package.
2) Changed the view name as well as the entities used. Now the records are coming as expected.
3) Corresponding changes in the findOrdersToPickMove service.

The main purpose of this view entity is to find out the location (areaId) of the inventory item that is reserved/picked for a particular order. For example if an order has two 
order items X and Y and items X is picked from area A and item Y is picked from area B of a facility (where obviously area A and B are associated to a pick/primary location), 
then while grouping this order in facility > picking screen by "Group by Warehouse Area" method will show order under Multi Locations group. To clarify more on this grouping
method, grouping is done only with the areaId and the locationSeqId (which is a combination of areaId, aisleId, sectionId, levelId, positionId).  


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@779041 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 07:44:17 +00:00
Jacques Le Roux 058d6aed57 A patch from Ashish Vijaywargiya "Change Copyright Year" (https://issues.apache.org/jira/browse/OFBIZ-2346) - OFBIZ-2346
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@772936 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 10:56:14 +00:00
Andrew Zeneski 64b3a8bf99 changed package name to match the component; also previous package name was not all lower case creating a new package when viewing in webtools
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763356 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 19:23:18 +00:00
Jacques Le Roux b9c3ddef08 2d part and end of an effort to remove trailing spaces
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg)

Of course this effort to remove trailing spaces has no functional implications.

Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {

So these changes are also in this commit, should not be a problem anyway.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Hans Bakker cd93cb31d4 be able to relate a project to an order (order component is not dependant on project manager)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@749560 13f79535-47bb-0310-9956-ffa450edef68
2009-03-03 08:07:35 +00:00
Hans Bakker 73abc819f5 corrected an error in QuoteWorkEffortView definition causing an error message in the startup log
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726335 13f79535-47bb-0310-9956-ffa450edef68
2008-12-14 02:18:26 +00:00
Jacques Le Roux 4085538f6f Fix 2 erroneous entity view titles found by chance while working on ProtectedView
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@726131 13f79535-47bb-0310-9956-ffa450edef68
2008-12-12 22:04:33 +00:00
Jacques Le Roux 52595e4f48 A slightly modified patch from Bilgin Ibryam "Allow multi-pagination in a page" (https://issues.apache.org/jira/browse/OFBIZ-1935) - OFBIZ-1935
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@725053 13f79535-47bb-0310-9956-ffa450edef68
2008-12-10 10:39:16 +00:00
Hans Bakker caf7e4a2e1 show and enable to add content to customer requests
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@720114 13f79535-47bb-0310-9956-ffa450edef68
2008-11-24 04:44:00 +00:00
Bilgin Ismet Ibryam 9766672b3b A patch from Luke Prentice "OrderHeaderItemAndShipGroup should exclude facilityId from OrderItemShipGroup." - OFBIZ-1960
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@696160 13f79535-47bb-0310-9956-ffa450edef68
2008-09-17 05:46:25 +00:00
Hans Bakker 6111f33a31 allow contacts of the same customer account see each other customer requests
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@690628 13f79535-47bb-0310-9956-ffa450edef68
2008-08-31 03:19:51 +00:00
Ashish Vijaywargiya d7867af0b0 Patch from JIRA issue https://issues.apache.org/jira/browse/OFBIZ-1910 "Add support of fromDate & thruDate in CustRequestRole entity".
Slight change in Entity name in this commit.
In the attached patch the  name of entity was "CustomerRequestRole" but in this commit the name of new entity is "CustRequestParty"(Looked more close to the data model pattern).

Thanks Bilgin for your valuable Input on this.
I have also written the Migration service for providing the Backward compatibility.

Special thanks to Ratnesh & Jacopo in discussing with me on this work.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686731 13f79535-47bb-0310-9956-ffa450edef68
2008-08-18 11:47:14 +00:00
Hans Bakker 759bf5a7e0 list all customer requests with optional workeffort....correcting link error
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@686168 13f79535-47bb-0310-9956-ffa450edef68
2008-08-15 07:36:16 +00:00
Jacques Le Roux 9df2242f77 More information for the related view
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@685084 13f79535-47bb-0310-9956-ffa450edef68
2008-08-12 08:40:19 +00:00
Hans Bakker cfceea64cb add the communicationEventlist (copied the form: see issue OFBIZ-1914) and related workefforts to the request view, also added a view to be able to do this.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@684392 13f79535-47bb-0310-9956-ffa450edef68
2008-08-10 01:17:03 +00:00
Jacopo Cappellato 6747f82760 Misc small enhancements to the Product Catalog "Inventory" screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@682281 13f79535-47bb-0310-9956-ffa450edef68
2008-08-04 07:58:52 +00:00
Hans Bakker a15543b13c some corrections to this view to remove the error messages in the startup log
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@678627 13f79535-47bb-0310-9956-ffa450edef68
2008-07-22 03:36:48 +00:00
Hans Bakker 35ec502a49 added partyId field to customerRequestType, created related view to partyReLationship to be able to list customerRequests by reponsible person and added new service to change customer request status
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@678339 13f79535-47bb-0310-9956-ffa450edef68
2008-07-21 04:08:30 +00:00
Jacques Le Roux 641ff10050 Update Copyright to 2008
A real replace in files feature was one of the reasons I use Eclipse 3.4 for near a year now (I even helped to test, a real must have :o)
Not sure previous commit was sent partially or not at all (I needed to update)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@677685 13f79535-47bb-0310-9956-ffa450edef68
2008-07-17 18:56:25 +00:00
Hans Bakker 9e307a06f2 show related customer requests on a comunication event view
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@677360 13f79535-47bb-0310-9956-ffa450edef68
2008-07-16 17:49:51 +00:00
Hans Bakker dc1773130b show communication events on a customer request overview
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@677306 13f79535-47bb-0310-9956-ffa450edef68
2008-07-16 15:24:18 +00:00