Commit graph

1551 commits

Author SHA1 Message Date
Lance Edgar 878486cdab Capture user input for mobile receiving, and move some lookup logic
i.e. most of the logic responsible for looking up an item from e.g. scanner
entry, now lives in the handler for easier customization
2018-09-25 17:50:16 -05:00
Lance Edgar ed5455089e Expose item_entry field for receiving batch row 2018-09-22 20:18:52 -05:00
Lance Edgar d7863c2572 Add speedbump by default when deleting any "row" record
also, allow deleting rows for truck dump child batch
2018-09-22 19:27:17 -05:00
Lance Edgar 4a610ba2e6 Misc. UI improvements for truck dump receiving on desktop
links back and forth between parent/child rows, a little help text etc.
2018-09-22 18:33:01 -05:00
Lance Edgar 255485296c Leverage alternate code also, for mobile product quick lookup 2018-09-21 19:58:08 -05:00
Lance Edgar 99688c1c77 Update changelog 2018-09-20 18:23:09 -05:00
Lance Edgar fb3105c099 Fix batch row status breakdown, for rows with no status 2018-09-20 18:22:36 -05:00
Lance Edgar c3637bc416 Update changelog 2018-09-20 16:20:49 -05:00
Lance Edgar 8c26b632fe Only show mobile "quick receive" buttons if product is identifiable 2018-09-20 16:15:45 -05:00
Lance Edgar 0b9fe2dfe7 Add simple row status breakdown when viewing batch 2018-09-20 15:58:45 -05:00
Lance Edgar 3b0292029d More basic field tweaks for mobile "view product" page 2018-09-19 20:42:10 -05:00
Lance Edgar 3a91ab6bec Fix price fields, add pref. vendor/cost fields for mobile product view 2018-09-19 19:11:59 -05:00
Lance Edgar 66f1ed0e41 Do quick lookup by vendor item code, alt code for mobile receiving
at least until we have to make that configurable etc.
2018-09-19 18:22:59 -05:00
Lance Edgar acd8c97afc Fix how we check config for mobile "quick receive" feature
at least hopefully this fixes it, and doesn't break anybody..
2018-09-19 17:16:15 -05:00
Lance Edgar be49ca6967 Add quick-receive 1EA, 3EA, 6EA for mobile receiving
but only when cases are allowed.  at least for now...should surely be more
configurable than we have it now
2018-09-19 17:11:16 -05:00
Lance Edgar 2939b53467 Show red background for mobile receiving if product not found 2018-09-19 17:00:45 -05:00
Lance Edgar 6fb78c5dde Add setting to show/hide product image for mobile purchasing/receiving 2018-09-19 16:42:50 -05:00
Lance Edgar 5b2f4127ea Fix bug when editing truck dump child batch row quantities
sometimes we need to "add" to an existing claim which has qty None
2018-09-19 11:00:10 -05:00
Lance Edgar c5fef6b954 Add unique check for "name" when creating new Role 2018-09-19 10:00:59 -05:00
Lance Edgar 84db66a60c Update changelog 2018-09-10 18:55:55 -05:00
Lance Edgar db0eee707a Fix default (status) filter for Employees grid 2018-09-06 20:37:06 -05:00
Lance Edgar 06b5f6c97c Update changelog 2018-08-24 13:42:06 -05:00
Lance Edgar a6a7d22ec1 Honor view logic when displaying Delete Row button for mobile receiving
also do not allow quick receive if receiving from scratch
2018-08-17 12:41:48 -05:00
Lance Edgar f0d8f79676 Revert "Try to retry InvalidRequestError from sqlalchemy"
This reverts commit 4d0223e305.

well, that didn't work
2018-08-17 00:24:51 -05:00
Lance Edgar 4d0223e305 Try to retry InvalidRequestError from sqlalchemy
not sure if this is a good idea, hopefully can find out in a moment
2018-08-17 00:21:01 -05:00
Lance Edgar 528c0f9622 Refactor sqlerror tween to add support for pyramid_retry
hopefully this doesn't break anything else..
2018-08-17 00:04:59 -05:00
Lance Edgar 56392ccdd0 Add "quick receive all" support for mobile receiving
i.e. quick receive button can now receive all/remainder of the ordered qty
2018-08-16 22:21:58 -05:00
Lance Edgar d4b2cf9943 Update changelog 2018-08-14 17:06:24 -05:00
Lance Edgar 950af8b5e0 Add "quick lookup" for mobile Products page
only if enabled, otherwise just shows the normal grid
2018-08-09 22:11:44 -05:00
Lance Edgar 21740ea2fd Show links to claiming rows for truck dump parent row 2018-08-09 15:59:57 -05:00
Lance Edgar 5e879a2d92 Remove some unused code for ordering worksheets 2018-08-07 22:42:48 -05:00
Lance Edgar 6ef5677dc5 Use invoice total, PO total as fallback, for mobile receiving list 2018-08-07 21:41:43 -05:00
Lance Edgar ac451757b4 Add support for editing "claim" quantities for truck dump child row
at least i think this gets it all...guess we'll see
2018-08-07 15:19:38 -05:00
Lance Edgar a348755be2 Hide 'ordered' columns for truck dump parent row grid
since that batch type is only concerned with receiving
2018-08-07 13:09:13 -05:00
Lance Edgar a24076f0ce Make sure we refresh batch status when adding a new row
b/c whether or not it has a product will affect batch status.

this also changes how we interpret UPC for unknown product, i.e. by default we
now assume it does *not* have a check digit and that we should calculate that.
probably just a matter of time before someone needs the opposite though..
2018-08-02 16:58:38 -05:00
Lance Edgar e0f7ba827f Update changelog 2018-07-31 14:11:42 -05:00
Lance Edgar cefadc7c27 Don't configure versioning when making the app
that is now happening as part of the `make_config()` call
2018-07-31 14:08:38 -05:00
Lance Edgar de6401c5db Update changelog 2018-07-30 11:53:40 -05:00
Lance Edgar e43f713a66 Various tweaks for arbitrary model view with "rows"
just needed these for a particular feature...
2018-07-26 21:35:15 -05:00
Lance Edgar 8d77111b06 Update changelog 2018-07-26 13:50:15 -05:00
Lance Edgar f6712a6686 Redirect to "view parent" after deleting a row
not sure why that was redirecting to "edit parent" before...weird
2018-07-26 13:33:21 -05:00
Lance Edgar 6af9440ed7 Fix permission group label for Ordering Batches
a minor annoyance, but consistency surely is better...
2018-07-25 16:23:32 -05:00
Lance Edgar d145ce5f6d Assign purchase to new receiving batch via uuid instead of object ref
the latter was apparently causing session flush and would create the "dummy"
batch in addition to the "real" one...
2018-07-25 12:46:51 -05:00
Lance Edgar 634a93061b Let mobile form declare if/how to auto-focus a field
and for mobile ordering, auto-focus the "units" field when editing a row
2018-07-24 21:29:52 -05:00
Lance Edgar fba7c5f978 Update changelog 2018-07-19 17:39:29 -05:00
Lance Edgar 5db7d3776a Expose status etc. when editing upgrade, rename Email Settings
i.e. latter is renamed from Email Profiles, but within UI only for now
2018-07-18 21:06:07 -05:00
Lance Edgar 34bdd2ac84 Add (restore?) basic support for mobile receiving from PO 2018-07-18 16:25:54 -05:00
Lance Edgar 87ba8026e5 Don't use empty string as default setting value
should just fall back to None as per usual
2018-07-18 13:53:24 -05:00
Lance Edgar c2968fbe52 Don't save any App Settings for which value would not change
that lets us avoid writing "redundant" values to the database, whereas in fact
the underlying value may be coming from config file
2018-07-18 13:50:32 -05:00
Lance Edgar 117e52df23 Remove unwanted line 2018-07-18 13:24:51 -05:00
Lance Edgar 4e09b757c3 Add (admin-friendly!) view to manage some App Settings
which settings are available to this view will depend on the project's settings
module, similar to how the email settings work
2018-07-18 13:09:32 -05:00
Lance Edgar 012a06d8a6 Tweak some purchase batch logic per changes in rattail 2018-07-17 20:38:48 -05:00
Lance Edgar d8b45db331 Improve support for "receive from scratch" workflow, esp. for mobile
also try harder to make certain aspects easier to enable/disable via handler,
e.g. whether cases should be allowed as quantity input, or expired credits
should be a thing etc.
2018-07-17 19:55:15 -05:00
Lance Edgar a34a42d2b2 Refactor mobile receiving to use "quick row" feature
plus some other random things thrown in there, for good measure..
2018-07-16 20:40:29 -05:00
Lance Edgar 3cc8adba86 Improve basic mobile views for customers, people 2018-07-15 18:13:30 -05:00
Lance Edgar eccce1cabb Add runtime mobile flag for MasterView
will be false unless one of the mobile views are in effect...hopefully this is
a good idea
2018-07-15 18:12:21 -05:00
Lance Edgar d3e67ccbcd Fix how we check file size when reading stdout for upgrade
i guess sometimes we were getting a negative number there
2018-07-15 17:40:46 -05:00
Lance Edgar 45f19517d3 Add 'person' column for customers grid
but don't show it by default, for now?
2018-07-15 16:23:20 -05:00
Lance Edgar 259d123876 Traverse master class hierarchy to collect all defined labels
i.e. for forms and grids
2018-07-15 16:22:30 -05:00
Lance Edgar 0853fac66a Fix Person.customers readonly field for python 3 2018-07-15 16:22:03 -05:00
Lance Edgar 6fc517269f Don't make customer ID readonly when editing
i mean, custom apps are welome to, but seems a bit heavy-handed as default
2018-07-15 15:33:35 -05:00
Lance Edgar 0e57152888 Add product grid filters for "on hand", "on order" 2018-07-13 20:17:22 -05:00
Lance Edgar 935a6b2a68 Add basic autocomplete support for "quick row" feature 2018-07-13 19:12:39 -05:00
Lance Edgar 68bd3047c4 Add initial support for mobile "quick row" feature, for ordering
at least for now, ordering only, but hopefully much more soon...
2018-07-12 22:53:29 -05:00
Lance Edgar aa6e540abd Use upload time as default filter/sort for Trainwreck transactions
also show end time, upload time as grid columns
2018-07-11 13:30:48 -05:00
Lance Edgar 9caf0e2e1f Update changelog 2018-07-11 10:29:40 -05:00
Lance Edgar 8039af1c06 Fix cancel button for progress page
i.e. should actually cancel when clicked...
2018-07-11 10:10:06 -05:00
Lance Edgar 699536b1ab Add "?" for daily time sheet total if partial shift present 2018-07-10 17:45:33 -05:00
Lance Edgar 16ab8b6ffa Stop trying to be smart about "best fit" cases/units for receiving
i.e. just record amounts as provided by the user.  sometimes it is necessary
for the user to avoid "cases" altogether if they detect the "case quantity" to
be incorrect
2018-07-10 16:43:21 -05:00
Lance Edgar 477a34cfa7 Improve how cases/units, uom are handled for mobile receiving
last-used uom should be more or less sticky, etc.
2018-07-10 14:24:12 -05:00
Lance Edgar 147c65afe6 Try to be smart about how we update cases/units for receiving batch row
e.g. if you receive 1 CS (@ 12/CS) and then subtract 4 EA then you should wind
up with 8 EA for the row
2018-07-10 13:36:28 -05:00
Lance Edgar 2983ff7ba0 Highlight purchasing batch rows with "case quantity differs" status 2018-07-10 12:38:58 -05:00
Lance Edgar ed6f2f27cc Show "truck dump" info for applicable receiving batch page title 2018-07-10 11:39:22 -05:00
Lance Edgar 9dd6f8ef7d Tweak default page title for master view 2018-07-10 11:39:00 -05:00
Lance Edgar 053fc4eb55 Sort mobile receiving rows by last modified instead of sequence
because we now prefer to aggregate rows for that, at least by default
2018-07-10 09:06:22 -05:00
Lance Edgar 44663fe548 Fix bug for inventory batch when product not found 2018-07-09 21:28:36 -05:00
Lance Edgar c88d060fe0 Force user to count "units" and not "packs" for inventory batch
at least until we come up with something smarter...
2018-07-09 15:50:28 -05:00
Lance Edgar 469f9cf015 Update changelog 2018-07-09 14:29:34 -05:00
Lance Edgar 3dfdb26502 Improve basic support for unit/pack info when viewing product details 2018-07-08 00:01:14 -05:00
Lance Edgar 9149902c78 Remove deprecated "edbob" settings 2018-07-07 20:43:17 -05:00
Lance Edgar b464db5722 Change field ordering for customer form
so that default_email comes next to email_preference
2018-07-06 14:17:33 -05:00
Lance Edgar 8cadec9a16 Fix enum values for customer email preference grid filter 2018-07-06 14:15:33 -05:00
Lance Edgar 00a0e6fb11 Update changelog 2018-07-03 20:55:11 -05:00
Lance Edgar 9a0a280d7d Tweak how some "pack item" fields are displayed when viewing product 2018-07-03 20:47:32 -05:00
Lance Edgar ad5444d270 Update changelog 2018-07-03 18:57:34 -05:00
Lance Edgar 3cc789dda9 Fix batch action kwargs, so 'action' can be a handler kwarg
i.e. at least the handheld batch handler, accepts an 'action' kwarg for its
execute() method.  we had apparently broken that
2018-07-03 18:32:03 -05:00
Lance Edgar ac5a6c011b Fix batch file download link URL 2018-07-03 18:25:34 -05:00
Lance Edgar 6febd01e76 Don't read upgrade progress file if size hasn't changed
apparently that is possible sometimes?  or perhaps just an issue on python 3?
2018-07-02 12:06:09 -05:00
Lance Edgar 4c2f1aa4ed Update changelog 2018-06-29 14:23:29 -05:00
Lance Edgar 944e896196 Consider any integer greater than PG allows, to be invalid grid filter value
this feels pretty hacky...would be nice to come up with a better way
2018-06-29 12:56:22 -05:00
Lance Edgar 4ffd0df7c1 Update changelog 2018-06-28 15:17:44 -05:00
Lance Edgar 2ffb930f7f Fix how "unknown product" row is added to receiving batch 2018-06-28 12:27:40 -05:00
Lance Edgar 8d0dfd631b Show department column for receiving batch rows 2018-06-28 12:27:30 -05:00
Lance Edgar 350e901c2a Highlight "cost not found" as warning, for purchasing batch 2018-06-28 12:27:04 -05:00
Lance Edgar 1342d67746 Improve basic support for adding new product 2018-06-28 12:26:22 -05:00
Lance Edgar b9d699df84 Fix email preview logic per python 3
can't use filter() anymore
2018-06-28 12:25:44 -05:00
Lance Edgar 6b01a7e888 Add highlight for "cost not found" rows in purchasing batch 2018-06-27 18:40:22 -05:00
Lance Edgar 49f241a4b9 Accept invoice number when adding truck dump child from invoice file 2018-06-27 18:00:28 -05:00
Lance Edgar eeba784c32 Be smarter about when we sort receiving batch by most recent (for mobile)
i.e. only do so when *not* aggregating products, since that probably needs a
closer look first
2018-06-27 17:29:31 -05:00
Lance Edgar 0ccb6883f8 Don't aggregate product for mobile truck dump receiving
also sort batch rows by most recent, for receiver convenience
2018-06-27 17:26:38 -05:00