Commit Graph
12781 Commits
Author SHA1 Message Date
Jacques Le Roux b91db68955 Sequel of uppercase french accents, a patch from Peter Goron. This one was missing.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@427595 13f79535-47bb-0310-9956-ffa450edef68
2006-08-01 14:57:01 +00:00
Jacques Le Roux b9a9835447 There was a problem for this file in the previous commit. Thanks to Peter Goron who noticed it.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@427584 13f79535-47bb-0310-9956-ffa450edef68
2006-08-01 14:13:04 +00:00
Jacques Le Roux d6301a57bf Uppercase french accents, a patch from Peter Goron.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@427577 13f79535-47bb-0310-9956-ffa450edef68
2006-08-01 13:30:33 +00:00
Jacques Le Roux e89160d370 Applying the Apache CTR policy I commit this change (dynamic ASL2 in xpos.properties) to close old Jira OFBIZ-884
If anybody think that this is not to be done, please feel free to revert the file.
Thanks

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@427570 13f79535-47bb-0310-9956-ffa450edef68
2006-08-01 13:15:42 +00:00
Jacopo Cappellato 02e4756763 Improved the bom simulation screen: it is now possible to get information about qoh and costs of the bom's component.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@427547 13f79535-47bb-0310-9956-ffa450edef68
2006-08-01 12:00:15 +00:00
Jacopo Cappellato c5d483e28c Fixed bad variable name (caused by cut'n'paste!) that was causing the standard costs to be inaccurate.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@427525 13f79535-47bb-0310-9956-ffa450edef68
2006-08-01 10:55:30 +00:00
Jacques Le Roux d194c8fa7a A patch from Ray Barlow to improve and ease reading of NullPosPrinter writing in the log.
Simply groups the printer commands (for example receipt) together so that they will dump to the logs in one go which makes it a lot easier to see the receipt formatting when developing and making changes. WIthout this patch all the lines of a print get broken across different log messages and it's very hard to see and check formatting.
Not actually used for production deployments were real printers are attached. 

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@427496 13f79535-47bb-0310-9956-ffa450edef68
2006-08-01 09:14:02 +00:00
Jacopo Cappellato f2d415af6b Added "Incoterms" term types.
Incoterms are internationally accepted commercial terms defining the respective roles of the buyer and seller in the arrangement of transportation and other responsibilities and clarify when the ownership of the merchandise takes place.
They are used in conjunction with a sales agreement or other method of transacting the sale.
http://www.export.gov/incoterms.html



git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@427495 13f79535-47bb-0310-9956-ffa450edef68
2006-08-01 09:09:46 +00:00
Si Chen 507ce51009 Return false when UtilAccounting is used to check payment or account type of null payments or accounts. Based on patch from Ashish Vijaywargiya. OFBIZ-126
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@427319 13f79535-47bb-0310-9956-ffa450edef68
2006-07-31 22:01:16 +00:00
Jacopo Cappellato 31e9ddd06b small cleanup.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@427168 13f79535-47bb-0310-9956-ffa450edef68
2006-07-31 16:48:33 +00:00
Jacopo Cappellato ef9e63a249 Implemented the copy of an agreement.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@427159 13f79535-47bb-0310-9956-ffa450edef68
2006-07-31 16:33:26 +00:00
Jacopo Cappellato 305bd27950 Implemented default country selection for "NewCustomer" screen.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@427113 13f79535-47bb-0310-9956-ffa450edef68
2006-07-31 13:24:35 +00:00
Jacopo Cappellato a6eb3d3226 Small corrections to Italian labels.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@427100 13f79535-47bb-0310-9956-ffa450edef68
2006-07-31 12:27:20 +00:00
Jacopo Cappellato c88b16034b Added new quote header field to store the quote's sales channel (Quote.salesChannelEnumId).
The quote's sales channel is propagated to the order and when a cart is used to create a quote, the sales channel of the cart is used to populate the sales channel of the quote.

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@427099 13f79535-47bb-0310-9956-ffa450edef68
2006-07-31 12:25:24 +00:00
Jacopo Cappellato 4f8c46f91b Refactored the way the units of marketing packages that can be assembled from components in warehouse are computed; there is now a separate service "getMktgPackagesAvailable" that must be explicitly invoked.
This should solve the issues recently reported by Si Chen.


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@427070 13f79535-47bb-0310-9956-ffa450edef68
2006-07-31 10:48:58 +00:00
Jacopo Cappellato 4162a25a55 Put in context tasks and components to make easier to use them outside form widgets.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@427060 13f79535-47bb-0310-9956-ffa450edef68
2006-07-31 09:51:24 +00:00
Jacques Le Roux b14396c4d6 Revert XUI engine to 2.0.5 version.
There is a conflict with Xpage.showPage which is waiting for a PageSupport result in 2.0.7.
Will see that later, after telling Xoetrope about the problem.
I tested it before and thought it was working well.
But using Eclipse I did rebuild only the POS component and XUI engine is in framework/guiapp component !

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426803 13f79535-47bb-0310-9956-ffa450edef68
2006-07-29 13:53:47 +00:00
Jacques Le Roux 501c5fd53d Sorry : better English (I hope) for the comment about vertical bar
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426771 13f79535-47bb-0310-9956-ffa450edef68
2006-07-29 09:41:28 +00:00
Jacques Le Roux 9709e33901 Added a comment about why the vertical bar on journal panel is always visible
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426770 13f79535-47bb-0310-9956-ffa450edef68
2006-07-29 09:39:28 +00:00
Jacques Le Roux 5b598b3217 Update XUI to 2.0.7 (forgot to update the classpath file)
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426769 13f79535-47bb-0310-9956-ffa450edef68
2006-07-29 09:35:35 +00:00
Jacques Le Roux eb325d3a19 Update XUI to 2.0.7
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426768 13f79535-47bb-0310-9956-ffa450edef68
2006-07-29 09:32:01 +00:00
Jacopo Cappellato 1acb364420 Small html fix.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426766 13f79535-47bb-0310-9956-ffa450edef68
2006-07-29 09:18:48 +00:00
Jacques Le Roux f59cfc7500 French labels update from Peter Goron
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426567 13f79535-47bb-0310-9956-ffa450edef68
2006-07-28 15:32:41 +00:00
Jacques Le Roux 65ccd50128 The introduction of spaces around = was annoying for synchro of Neogia. I reverse without them.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426471 13f79535-47bb-0310-9956-ffa450edef68
2006-07-28 10:23:49 +00:00
Jacques Le Roux 64d1c5716a The introduction of spaces around = was annoying for synchro of Neogia. I reverse without it.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426469 13f79535-47bb-0310-9956-ffa450edef68
2006-07-28 10:13:21 +00:00
Jacques Le Roux 47fb1295a2 The introduction of spaces around = was annoying for synchro of Neogia. I reverse without it.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426467 13f79535-47bb-0310-9956-ffa450edef68
2006-07-28 10:10:16 +00:00
Jacques Le Roux 96329da432 Update of ASF header (suppression of $Id)
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426455 13f79535-47bb-0310-9956-ffa450edef68
2006-07-28 09:30:20 +00:00
Jacques Le Roux 5ed00cf8d9 Update of ASF header
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426454 13f79535-47bb-0310-9956-ffa450edef68
2006-07-28 09:28:52 +00:00
Jacques Le Roux ff07abe2c8 Update of french labels
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426430 13f79535-47bb-0310-9956-ffa450edef68
2006-07-28 08:21:19 +00:00
Jacques Le Roux 5f9d8563d9 Update of french labels
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426429 13f79535-47bb-0310-9956-ffa450edef68
2006-07-28 08:17:45 +00:00
Jacopo Cappellato d06a0b9dba Committed new version of the Shipment Manifest report from Marco Risaliti (OFBIZ-112).
The patch was very good (thanks Marco!), however I've cleaned up a bit of formatting issues (mostly tabs to spaces and removed newlines before brackets) to make the code compliant with the OFBiz formatting conventions:
http://docs.ofbiz.org/display/OFBADMIN/Coding+Conventions


git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426421 13f79535-47bb-0310-9956-ffa450edef68
2006-07-28 07:44:28 +00:00
Jacques Le Roux d0ec04e598 Update of french labels in OrderUiLabels_fr.properties.
BTW I saw labels in german file that seems should not be here, just an advice ;o)

#Stored by I18NEdit, may be edited!
AccountingAccountNumber = Kontonummer
AccountingAccountType = Kontenart
...
CommonAll = alle
CommonAny = ein
...
EcommerceAddAlltoCart = Alles in den Warenkorb legen
EcommerceAddCheckedtoCart = Ausgew\u00E4hlte Artikel in den Warenkorb legen
...
FacilityBillingAddressSameShipping = Rechnungsadresse und Lieferadresse stimmen \u00FCberein
FacilityFacility = Lager
...

etc.

There is some tokens (Common, Ecommerce) in Portugal (not Brazil) file too

Please correct if possible, this will ease the work with RBE (Ressource Bundle Editor), thanks

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426419 13f79535-47bb-0310-9956-ffa450edef68
2006-07-28 07:27:04 +00:00
Jacopo Cappellato ff962da4dd Fixed bug reported by Eriks Dobelis in Apache OFBIZ-117: broken link in the communication content screen.
Also cleaned up a few more form definitions.

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426411 13f79535-47bb-0310-9956-ffa450edef68
2006-07-28 07:01:46 +00:00
Jacopo Cappellato 965644a58a Fixed wrong variable name for shipmentId in work effort names.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426395 13f79535-47bb-0310-9956-ffa450edef68
2006-07-28 06:05:51 +00:00
Jacopo Cappellato 21a1008502 Fixed wrong form field definition for date fields.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426390 13f79535-47bb-0310-9956-ffa450edef68
2006-07-28 05:32:13 +00:00
Jacopo Cappellato c277904c1e Small html fix from Ray Barlow (Apache OFBIZ-107).
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426388 13f79535-47bb-0310-9956-ffa450edef68
2006-07-28 05:10:34 +00:00
Jacopo Cappellato f44ea12280 Fixed bug reported by Ray Barlow in Apache OFBIZ-107.
The "EditInventoryItem" screen can now have a null facility.

git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426387 13f79535-47bb-0310-9956-ffa450edef68
2006-07-28 05:08:07 +00:00
Si Chen fdd662369d Link to create new order of same type for same party (vendor or customer) from order view page
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426317 13f79535-47bb-0310-9956-ffa450edef68
2006-07-27 23:10:25 +00:00
Si Chen 16fb591f68 Ability to update shipping destination and method. Based on patch from Ashish Vijaywargiya. OFBIZ-54
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426301 13f79535-47bb-0310-9956-ffa450edef68
2006-07-27 22:47:12 +00:00
Jacopo Cappellato 9aba6d200b Fixed wrong unit price shown in purchase order entry.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426287 13f79535-47bb-0310-9956-ffa450edef68
2006-07-27 22:28:32 +00:00
Si Chen 75eb08ea5c Reorganized method for getting balance of billing account and imposed a limit of BillingAccount.accountLimit on the balance. See comments in code.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426204 13f79535-47bb-0310-9956-ffa450edef68
2006-07-27 19:24:35 +00:00
Si Chen 2c06ee1c0a Forgot to add this new parameter from last commit
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426180 13f79535-47bb-0310-9956-ffa450edef68
2006-07-27 18:18:40 +00:00
Si Chen 12c9d65865 Link back to billing account from order view page
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426169 13f79535-47bb-0310-9956-ffa450edef68
2006-07-27 17:58:30 +00:00
Si Chen d26abdad71 Use the correct available to capture amount to determine how much to capture on billing account versus other payment methods
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426168 13f79535-47bb-0310-9956-ffa450edef68
2006-07-27 17:58:03 +00:00
Jacques Le Roux c9ffa2808c The journal (part of the screen where bought items show) was not scrollable. This is now possible.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426081 13f79535-47bb-0310-9956-ffa450edef68
2006-07-27 14:11:01 +00:00
Jacopo Cappellato a47c806d36 Applied patch from Christian Geisert (Apache OFBIZ-116) to fix a wrong column name.
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@426026 13f79535-47bb-0310-9956-ffa450edef68
2006-07-27 10:01:32 +00:00
Hans Bakker d01df96156 create a new service to create an invoice from an order using all orderitems: createInvoiceForOrderAllItems
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@425946 13f79535-47bb-0310-9956-ffa450edef68
2006-07-27 03:52:55 +00:00
Hans Bakker 0bd293bff5 make useTimeUomId madatory on screen to be consistant with the subscription service
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@425945 13f79535-47bb-0310-9956-ffa450edef68
2006-07-27 03:49:46 +00:00
Si Chen 97143917a4 Fixed bad partyIdFrom/partyIdTo on Payments when capturing payments to billing accounts
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@425790 13f79535-47bb-0310-9956-ffa450edef68
2006-07-26 18:05:56 +00:00
Si Chen 25e62f8b24 Added currency to balances on billing account summary and fixed bad UI label for tooltop
git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@425789 13f79535-47bb-0310-9956-ffa450edef68
2006-07-26 18:05:37 +00:00