Commit Graph
10472 Commits
Author SHA1 Message Date
Jacques Le Roux 6a652db7a3 New swipWithCard property in parameters.properties, only used in ClientProfile.java for card number field for now
+
* Suppress serial warning
* Better French translation
* replace ShowKeyboardInSaveSale by showKeyboardInSaveSale in Java code

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@825444 13f79535-47bb-0310-9956-ffa450edef68
2009-10-15 09:19:40 +00:00
Jacques Le Roux eac20099b0 I stupidly committed with "en" in 1st place :(
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@825185 13f79535-47bb-0310-9956-ffa450edef68
2009-10-14 16:42:51 +00:00
Jacques Le Roux 523763730f A patch from Pierre Smits "Remove old currencies of EURO countries." (https://issues.apache.org/jira/browse/OFBIZ-3034) - OFBIZ-3034
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@825182 13f79535-47bb-0310-9956-ffa450edef68
2009-10-14 16:36:56 +00:00
Jacques Le Roux 1f9804b03b This slipped in with r825046. Thanks to Erwan who noticed it in dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@825057 13f79535-47bb-0310-9956-ffa450edef68
2009-10-14 08:38:35 +00:00
Jacques Le Roux 8bfd6d2c75 A patch from Erwan de FERRIERES "Translation of the OFBiz help system in French" (https://issues.apache.org/jira/browse/OFBIZ-3036) - OFBIZ-3036
Here is the beginning of the translation for the OFBiz help system in French. This is only the root page.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@825046 13f79535-47bb-0310-9956-ffa450edef68
2009-10-14 07:36:33 +00:00
Jacques Le Roux 5dbe1fe524 I put a modified file in, this fix it
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@824967 13f79535-47bb-0310-9956-ffa450edef68
2009-10-13 22:58:19 +00:00
Jacques Le Roux 7beb1ad4a9 In this case I don't need to persist the property.
This changes just do that : set temporary the property in memory, and reset it back to its original value

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@824937 13f79535-47bb-0310-9956-ffa450edef68
2009-10-13 21:37:49 +00:00
Jacques Le Roux a6fefdbeab When working with the POS I often need to use it in conjunction with back-end and sometimes even eCommerce.
This Windows batch file and container configurations just allow that. 
    startofbizBoth.bat loads the POS+EPR+eCommerce
    startofbizPos.bat loads only the POS
I did not care to write scripts for Linux yet because I do not have any needs.
I will certainly later if nobody has done it before...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@824935 13f79535-47bb-0310-9956-ffa450edef68
2009-10-13 21:30:00 +00:00
Jacques Le Roux 78314a684f Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@824117 13f79535-47bb-0310-9956-ffa450edef68
2009-10-11 17:38:48 +00:00
Jacques Le Roux b69054a8ab Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@824115 13f79535-47bb-0310-9956-ffa450edef68
2009-10-11 17:33:09 +00:00
Bruno Busco c3b196b5c4 Better Italian labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823958 13f79535-47bb-0310-9956-ffa450edef68
2009-10-10 21:53:14 +00:00
Jacques Le Roux e35a3b0105 Remove duplicates
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823954 13f79535-47bb-0310-9956-ffa450edef68
2009-10-10 21:39:23 +00:00
Bruno Busco 8097c21171 Better Italian labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823861 13f79535-47bb-0310-9956-ffa450edef68
2009-10-10 14:41:14 +00:00
Bruno Busco d711af1dd7 Better Italian labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823857 13f79535-47bb-0310-9956-ffa450edef68
2009-10-10 14:09:08 +00:00
Bruno Busco 6926457840 Added TabBars menus for the WebTools application. (OFBIZ-3020)
The WebTools main screen is still untouched so that all screens can be reached in the same way as before.
When we are OK with the new screens grouping under menus we will remove the main screen as it is now.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823806 13f79535-47bb-0310-9956-ffa450edef68
2009-10-10 06:46:57 +00:00
Adrian Crum 9ee18d37c5 Updated client code to use the new Delegator factory method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823633 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 17:44:24 +00:00
Bruno Busco 907c48eae6 Fixed HTML markup
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823558 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 14:07:28 +00:00
Jacques Le Roux 8221fd7899 New feature : in the POS adds the possibility to create a client profile (for now : name, email, phone#, card id for promo), email is also used to create an user login with card id as pwd (login/pwd couple follows changes).
The card id is stored in the Person.memberId field. It's used as a promo code. So if the same id is defined as a promocode, any promotion using this promo code will be added to the cart when you select a client from the Client Profile screen. Else a message will pop when selecting the client.
The idea is to generate promo codes and to use them as card id when creating the physical card.

The Client Profile screen (from Promo button in promo panel) allow you to search for all client (all fields empty) or to focus on a client (at least one field files). For now the search use a stric equals but I plan to allow also contains (ie %like%)
You may edit the client profile and as explained above select a client to apply promotions related to his/her card id.
I plan to add a status bar at bottom of the POS screen to see promocodes used (you may still enter arbitrary promo code with the Promo Code button) or even maybe rather the related promotions (but I doubt there will enough place).
The promo code is used as long as the cart is open.

There are also some generics enhancement in PosTransaction not all related to this new feature.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823475 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 09:24:54 +00:00
Bruno Busco 5a89692be7 Changed <container style="screenlet"> pattern to <screenlet...>.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823416 13f79535-47bb-0310-9956-ffa450edef68
2009-10-09 06:04:13 +00:00
Adam Heath 7f94829d66 Don't use the internal CacheLine value iterator, instead iterating
over the keys, fetching the value, and then removing when it matches.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823319 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 20:49:17 +00:00
Adam Heath f4ce5e6276 Remove unneeded CacheLine import.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823317 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 20:48:43 +00:00
Adam Heath 05f7b61a95 Generics markup for service method signatures.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823313 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 20:39:32 +00:00
Adam Heath d9b4865da7 Misssed a few createCache calls, bother.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823299 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 19:51:50 +00:00
Adam Heath 2275cb5b78 Don't create CacheLineTable each time setPropertiesParam is called.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823298 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 19:49:57 +00:00
Adam Heath 3162462a72 Remove protected method, that isn't used.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823289 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 19:38:29 +00:00
Bruno Busco a9635f3d73 Added missing "screenlet-body" tag
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823237 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 17:30:56 +00:00
Jacques Le Roux 8583100478 Fix a recursive bug
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823175 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 13:43:11 +00:00
Bruno Busco 7c0b046d43 Changed <container style="screenlet"> pattern to <screenlet...>.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822940 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 22:24:52 +00:00
Bruno Busco a2d935caa7 Fixed markup to the right screenlet pattern (all screenlet content should be contained in a screenlet-body tag)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822939 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 22:23:16 +00:00
Jacques Le Roux 592440841b No functional changes only in documentation : replace some value-name per value-field plus remove some wrong dashes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822659 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 10:54:11 +00:00
Hans Bakker 682a5ab55b add a new chapter for testtools in the apache technical document
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822639 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 10:03:29 +00:00
Anil Patel ae2521e332 Removed extra container around labels in FindScreenDecorator. Applied style to label. This will eliminate extra div around text and also renders h1, h2 tags instead of using div with style=h1 (h2).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822581 13f79535-47bb-0310-9956-ffa450edef68
2009-10-07 04:22:19 +00:00
Jacques Le Roux 73c3ef546d Anymore BSH scripts but Groovy (while struggling with something that seems related to cache in POS, still investigating, really weird...)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822532 13f79535-47bb-0310-9956-ffa450edef68
2009-10-06 23:10:12 +00:00
Scott Gray ca09f69b94 Fix an inconsistency in GenericEntity's get methods when the key doesn't exist, get(String) throws an exception but get(Object) just logs a warning. Changed so that both methods just log a warning.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@822276 13f79535-47bb-0310-9956-ffa450edef68
2009-10-06 14:07:04 +00:00
Hans Bakker 23b160661a paging on testsuites in selenium test corrected
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821731 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 10:00:45 +00:00
Adam Heath b15b30ddfd Simple factory lookup, DelegatorFactory switched to abstract class.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821669 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 03:00:11 +00:00
Adrian Crum 7fa08f9079 Replaced GenericDelegator.getGenericDelegator(...) calls with new factory method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821649 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 01:53:50 +00:00
Adrian Crum a4d68934c9 Converted GenericDelegator concrete class references to Delegator interface references.
This commit requires ant clean. Also, external libraries that reference GenericDelegator will need to be updated.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821643 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 00:08:27 +00:00
Adam Heath db585f5d95 Oops, shouldn't have checked these 2 lines in.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821577 13f79535-47bb-0310-9956-ffa450edef68
2009-10-04 19:04:08 +00:00
Adam Heath 11df2b159a Make 2 reusable schema types, boolean, and aggregate-function.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821576 13f79535-47bb-0310-9956-ffa450edef68
2009-10-04 19:01:44 +00:00
Bruno Busco 62652236c1 Cleanup of the screenlet title in all FTL files.
Removed all occurrences of <div class="screenlet-header"><div class="boxhead"></div></div>
Replaced with the new
<div class="screenlet-title-bar"><div class="h3"></div></div>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821476 13f79535-47bb-0310-9956-ffa450edef68
2009-10-04 08:04:35 +00:00
Adam Heath 5a30fec5d9 Bother, forgot to allow default-resource-name at the top level.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821406 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 20:05:58 +00:00
Adam Heath 124ebc7e8d Suppress deprecation warnings.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821405 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 20:01:16 +00:00
Adam Heath f0b81f5331 Make use of feature from last commit, moving default-resource-name to
the top-level.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821404 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 19:54:55 +00:00
Adam Heath 80d220afe8 Allow <default-resource-name> globally.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821403 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 19:53:20 +00:00
Adrian Crum dd22f83c72 Improvements to the GenericDelegator refactoring - based on suggestions from Adam Heath.
I removed the deprecated methods from the Delegator interface. So, any replacements of GenericDelegator.getGenericDelegator(...) with the new factory method will have to include code to replace the deprecated method calls.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821391 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 18:52:29 +00:00
Scott Gray 1c8d1d3ef5 Added generics markup
Another file I missed committing in r821238

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821242 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 04:27:02 +00:00
Hans Bakker 66083e21a7 update as suggested by Scott
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@820542 13f79535-47bb-0310-9956-ffa450edef68
2009-10-01 06:06:52 +00:00
Bruno Busco aad170f2e6 Added missing submit button in Example portlet
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@820537 13f79535-47bb-0310-9956-ffa450edef68
2009-10-01 05:35:58 +00:00
Jacques Le Roux 5330401ba3 Allow to use another language than the default one (locale) in the POS
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@820234 13f79535-47bb-0310-9956-ffa450edef68
2009-09-30 10:23:18 +00:00