Commit Graph
238 Commits
Author SHA1 Message Date
Jacques Le Roux 44c2c39d1d To allow to void a sale in POS
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@884529 13f79535-47bb-0310-9956-ffa450edef68
2009-11-26 11:35:50 +00:00
Jacques Le Roux c72b29cb1f Use UtilValidate.isNotEmpty methods instead of (obj != null) || (obj.length > 0) and (obj != null) || (obj.size > 0)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883549 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 23:41:34 +00:00
Jacques Le Roux 5518e9baf8 Use UtilValidate.isEmpty methods instead of (obj == null) || (obj.size == 0)
Complete r883492

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883516 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 22:02:05 +00:00
Adam Heath 820d11eb97 Deprecate UtilCache constructors, and add a create helper function.
This is the first step to making utilCacheTable concurrent, and
non-blocking.  To do so, the constructor has to have no side-effects.
This means it can't modify utilCacheTable itself; this will be moved to
the helper function created above.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@883217 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 02:56:28 +00:00
Jacques Le Roux 94fe299ddf Close "Replace all "0.00" in java code, notably to allow passing different decimals lenghtes" (https://issues.apache.org/jira/browse/OFBIZ-3200) - OFBIZ-3200
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@836153 13f79535-47bb-0310-9956-ffa450edef68
2009-11-14 11:01:08 +00:00
Jacques Le Roux c288cd7627 Correct French label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834935 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 16:09:43 +00:00
Jacques Le Roux 4a019210e3 Some better log info. Related to OFBIZ-487 which was actually already in.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834793 13f79535-47bb-0310-9956-ffa450edef68
2009-11-11 07:50:56 +00:00
Jacques Le Roux 7d1aba95f3 Oops, forgot the else block in r834173
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834214 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 20:21:57 +00:00
Jacques Le Roux f72098d435 Sometimes product description is not available, and internal name is not localisable (AFAIK), product name helps then...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834173 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 18:45:34 +00:00
Jacques Le Roux 3b13817da8 This is needed in POS at least for promotions which have a party in condition (or a promo code related). Anyway it's needed...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834140 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 16:44:23 +00:00
Jacques Le Roux d45dff2ac0 Safer : set partyId only if all is OK
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@834033 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 12:34:23 +00:00
Jacques Le Roux 509922b859 In ConfigureItem.java a work in progress should not have been committed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832879 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 21:50:31 +00:00
Jacques Le Roux ff2ea72c93 Small changes, no real impacts
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832848 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 19:25:37 +00:00
Jacques Le Roux f51a7ee047 File names consistency and show right screen at end of payment (I think this needs a little clean up, will do ASAP)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832358 13f79535-47bb-0310-9956-ffa450edef68
2009-11-03 09:24:26 +00:00
Jacques Le Roux 1904799cf7 Some generics in POS
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832186 13f79535-47bb-0310-9956-ffa450edef68
2009-11-02 23:22:46 +00:00
Jacques Le Roux ae4dd7bca2 Handle several promo codes in the Promo status bar and canceling them, with the customer selected as well
+ some better French labels
+ some generics
+ a MaxInactivity parameter has been introduced (was harcoded)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831753 13f79535-47bb-0310-9956-ffa450edef68
2009-11-01 20:04:17 +00:00
Jacques Le Roux ef251da11e Some more generics with Eclipse help
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831559 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 15:58:57 +00:00
Jacques Le Roux 4d98cc143b Consistent French label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831558 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 15:58:17 +00:00
Jacques Le Roux b0dd5b99ec POS Chinese labels from Terence NG "Simplified Chinese localization of PosUiLabels.xml" (https://issues.apache.org/jira/browse/OFBIZ-3131) - OFBIZ-3131
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831526 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 09:53:45 +00:00
Jacques Le Roux 5c5b076fa0 Replace client by customer in English in POS labels (in French it's only Client). I feel it's more a customer than a client.
+ new button label in MGR panel : "Void a sale", it's not the same than "Void the sale"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831522 13f79535-47bb-0310-9956-ffa450edef68
2009-10-31 08:54:14 +00:00
Jacques Le Roux b2402645d9 Some generics
+ fix a bug reported by Akash Jain on dev ML (in r831262)
+ improvements in PosTransaction.editClientProfile

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831314 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 14:35:20 +00:00
Jacques Le Roux 8eb8054542 Revert r831259 (done in haste wrong file) and add all generics needed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831262 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 11:08:41 +00:00
Jacques Le Roux e798f978d4 Following Scott's fix in r831246. Weird because this was compiling in Eclipse, so I did not notice my bad.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831259 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 10:55:22 +00:00
Jacques Le Roux 2fa5bbedb3 Add an azerty virtual keyboard to the POS
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831192 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 04:07:53 +00:00
Jacques Le Roux 389a8a2818 More in phase with other buttons labels (while rewriting the Till manual)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@831001 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 15:39:12 +00:00
Jacques Le Roux 11b49ef962 Forgot this in r830874
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830880 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 10:20:16 +00:00
Jacques Le Roux bab4d17071 This allows to print localized descriptions in the POS.
Also some unrelated generics changes in PosTransaction.java

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830874 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 09:39:04 +00:00
Jacques Le Roux a686aa38a0 Secure r830458 (avoid NPE)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830477 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 09:22:29 +00:00
Jacques Le Roux 5a6ad6a20d Using MSR to swip card number in Client Profile dialog box is better done with this version
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@830458 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 08:23:14 +00:00
Jacques Le Roux 1bd1555491 Parameters for sentinel characters while swapping card
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829799 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 13:49:50 +00:00
Jacques Le Roux d33703e280 Argh, wrong default value :/
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829722 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 08:07:13 +00:00
Jacques Le Roux 0d85dba614 Improve comments and better grammar
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829721 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 08:06:31 +00:00
Jacques Le Roux 50d9a78ad1 Useful comment about NO_PAYMENT when using external payment system in POS
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829717 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 07:41:23 +00:00
Jacques Le Roux 9e9c7580dd Forgot the last parameter (no CC references asked)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829714 13f79535-47bb-0310-9956-ffa450edef68
2009-10-26 07:21:30 +00:00
Jacques Le Roux 410d3155c7 In r829406 (Add a status bar to the POS) I forgot to clean before updating
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829408 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 16:49:27 +00:00
Jacques Le Roux 2549a493bc Add a status bar to the POS.
Purposely only used (visible fields) for now in the Promo Panel, to show possible promo or/and customer selected.
This to allow further status fields later, related to other panels

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829406 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 16:45:45 +00:00
Jacques Le Roux 066aa9cfce Typo in label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829353 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 12:12:02 +00:00
Jacques Le Roux da98323acb A complete file from Terence Ng " XuiLabels_zh.properties with newly translated variables" (https://issues.apache.org/jira/browse/OFBIZ-3078) - OFBIZ-3078
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829321 13f79535-47bb-0310-9956-ffa450edef68
2009-10-24 08:30:28 +00:00
Jacques Le Roux ad078b4151 Better virtual numpad : cancel button (when no % sign) and handle text
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@829025 13f79535-47bb-0310-9956-ffa450edef68
2009-10-23 12:24:55 +00:00
Jacques Le Roux c422abb9ed Forgot the 2 renamed files (name was ambiguous as there is another numeric.xml just near)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828866 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 21:53:11 +00:00
Jacques Le Roux 7356065e44 With this change it's now possible to dynamically swap the virtual keyboad and numpad on/off
Also reorganisation of the Admin Panel by grouping related buttons as much as possible

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828865 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 21:41:39 +00:00
Jacques Le Roux 8b71ed77fb Fix a wrong replace all
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828799 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 17:54:10 +00:00
Jacques Le Roux 9e2d8f8294 Add the possibility to search exact names or names containing the name entered
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828740 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 15:16:26 +00:00
Jacques Le Roux 0f427734e3 Code simplification in searchClientProfile
Remove trailing blanks in PosSecurityData.xml

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828667 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 12:02:30 +00:00
Jacques Le Roux dabd60c001 Refactoring of the client profile feature in POS. Mostly to allow more flexibility.
This adds the PARTYMGR_PCM_CREATE permission to the CLERK group and the partyId parameters is now used in createUpdatePartyEmailAddress 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@828363 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 08:28:49 +00:00
Jacques Le Roux 492adf62b6 The default error screen was too narrow
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@827960 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 11:01:48 +00:00
Jacques Le Roux 8c174c5584 Payment error cases were not handled right
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@827936 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 09:23:43 +00:00
Jacques Le Roux cc118cc031 Just figured it's easier to read from start to end
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@827896 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 06:14:58 +00:00
Jacques Le Roux fdc2ba245d Allow to enter cardId from MSR
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@827891 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 05:51:47 +00:00
Jacques Le Roux b26ab867a7 Better French translation
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826707 13f79535-47bb-0310-9956-ffa450edef68
2009-10-19 15:59:57 +00:00