Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,774 Commits 3 Branches 0 Tags 1 GiB
d48ab81622
Commit Graph

5434 Commits

Author SHA1 Message Date
Ankush Menat
d48ab81622 fix: auto-fulfill picking list when not in scan mode 2022-05-04 12:43:31 -04:00
Devin Slauenwhite
7ae89dedd5 fix: cleanup dont_allow_new_row logic 2022-05-04 11:06:16 -04:00
Devin Slauenwhite
4a19c1c19d Revert "fix(test): manually select picked_qty since before_submit validates qty instead of auto filling it" 
This reverts commit c2335ec0
 2022-05-04 10:29:52 -04:00
Devin Slauenwhite
5d8e3f264c Merge branch 'feat-picklist-scan' of /home/devin/repos/erpnext into feat-picklist-scan 2022-05-03 16:28:54 -04:00
Devin Slauenwhite
c2335ec0d8 fix(test): manually select picked_qty since before_submit validates qty instead of auto filling it 2022-05-03 16:28:28 -04:00
Devin Slauenwhite
afb841c771
Merge branch 'develop' into feat-picklist-scan 2022-05-03 11:15:42 -04:00
Ankush Menat
59a5090843
fix(UX): misleading stock entry lables (#30870) 
* fix(UX): misleading stock entry lables

* chore: field labels

[skip ci]

Co-authored-by: Marica <maricadsouza221197@gmail.com>

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-05-02 15:11:14 +05:30
Rushabh Mehta
548afba8bb
fix(minor): update frappe.error_log to new API (#30864) 
* fix(minor): update frappe.error_log to new API

* refactor: changes for updated log_error api

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-05-02 15:04:26 +05:30
Ankush Menat
dcda55641b
fix: convert default_item_manufacturer to link field (#30835) 2022-05-02 13:58:22 +05:30
Deepesh Garg
19d66e5219 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_consistency 2022-04-30 22:15:27 +05:30
Devin Slauenwhite
5ff471e22f fix: linter 2022-04-29 16:39:33 -04:00
Devin Slauenwhite
fa1378dd49 fix: prevent user from proceeding without all qty picked. 2022-04-29 16:38:52 -04:00
Devin Slauenwhite
5f8f83c6d8 fix: warn user pick list is not complete instead of auto fulfilling picked_qty. 2022-04-29 16:28:49 -04:00
Devin Slauenwhite
2554cdceeb revert: scan_mode flag 2022-04-29 13:45:59 -04:00
Devin Slauenwhite
24d8f62b21 revert: barcode scan field from pick list item. 2022-04-29 13:40:48 -04:00
Devin Slauenwhite
8053f2dbcd feat: increment picked_qty on scan_barcode 2022-04-27 22:10:15 -04:00
Devin Slauenwhite
e04fbb6a99 feat: pick list scan fields 2022-04-27 22:02:04 -04:00
Ankush Menat
777f0204dd
test: create new item instead of using with _Test Item (#30827) 
Unnecessary dependency causes flake in stock. The test was reposting all
entries for item just to test some behavior that is best tested on a
newly created item _anyway_.
 2022-04-27 17:47:40 +05:30
Ankush Menat
ebd5f0b1bb chore: make picked qty read only 2022-04-27 14:53:20 +05:30
Ankush Menat
8207697e43 fix: compare against stock qty while validating 
Other changes:

- only allow whole number of bundles to get picked
 2022-04-27 12:51:18 +05:30
Ankush Menat
9e60acdf56 test: test bundle - picklist behaviour 2022-04-27 12:05:15 +05:30
Ankush Menat
ee54ece8fd test: product bundle fixture 2022-04-27 12:05:15 +05:30
Ankush Menat
1ac275ce61 feat: transfer picklist stock info to packing list 2022-04-27 12:05:15 +05:30
Ankush Menat
41aa4b3524 fix: round off bundle qty 
This is to accomodate bundles that might allow floating point qty.
 2022-04-27 12:05:15 +05:30
Ankush Menat
25485edfd9 refactor: remove unnecssary vars 
also remove misleading docstring
 2022-04-27 12:05:15 +05:30
Ankush Menat
23cb0d684d feat: create DN from pick list with bundle items 2022-04-27 12:05:15 +05:30
Ankush Menat
f574121741 refactor: simpler check for non-SO items 2022-04-27 12:05:15 +05:30
Ankush Menat
277b51b404 refactor: groupby using keys instead of int index 2022-04-27 12:05:15 +05:30
Ankush Menat
3ddad6891a refactor: simplify needlessly complicated code 2022-04-27 12:05:15 +05:30
Ankush Menat
60bc26fdbe feat: back-update min picked qty for a bundle 2022-04-27 12:05:15 +05:30
Ankush Menat
c3fc0a4f55 perf: single update per Sales Order. 
For each SO item the sales order picking status was being updated, this
isn't required and wasteful.
 2022-04-27 12:05:15 +05:30
Ankush Menat
e64cc66df7 refactor: sales order status update 
- rename badly named variables
- support updated packed items
 2022-04-27 12:05:15 +05:30
Ankush Menat
36c5e8a14f feat: Pick list from SO with Product Bundle 2022-04-27 12:05:15 +05:30
Ankush Menat
7d5682020a test: bundles in picklist 2022-04-27 12:05:15 +05:30
Ankush Menat
5c3f9019cc refactor: misc pick list refactors 
- make tracking fields read only and no-copy 🤦
- collapse print settings section, most users configure it once and
  forget about it, not need to show this.
- call pick list grouping function directly
- use get_descendants_of instead of obscure db function
 2022-04-27 12:05:15 +05:30
marination
e2a163d4e9 fix: Use account_type == 'Stock' to filter stock accounts 2022-04-26 17:50:51 +05:30
marination
44331f4f1f chore: Warn users about multiple warehouse accounts 
- Get distinct accounts that warehouse value has been booked against
- If same account as the one being set, ignore
- If not same account or multiple accounts: warn user that it makes it harder to track mismatches
 2022-04-26 17:43:33 +05:30
Deepesh Garg
00ace8f62c
Merge branch 'develop' into accounting_dimension_consistency 2022-04-26 14:26:08 +05:30
Deepesh Garg
82a0635c66 fix: Consistent accounting dimensions across Sales and Purchase docs 2022-04-26 14:01:13 +05:30
Ankush Menat
7e555d3d8c fix: item price query for postgres 
postgres doesn't like bad type comparisons and doesn't have `isnull`
funciton
 2022-04-26 11:47:02 +05:30
Ankush Menat
7d2587c0a9 fix: nullish check and table name 2022-04-26 11:03:32 +05:30
Ankush Menat
ce75fe0ec4 fix: out of range date value 2022-04-26 11:03:32 +05:30
Ankush Menat
e1c1687661 refactor: use db agnostic CombineDatetime 2022-04-26 11:03:32 +05:30
Ankush Menat
d6a43a39ae
test: tie breaking in SLEs (#30796) 
[skip ci]
 2022-04-25 11:46:01 +05:30
Ankush Menat
d5ab626a31
Merge pull request #30726 from ankush/dependent_gle_reposting 
fix: dependent gle reposting
 2022-04-21 18:06:40 +05:30
Ankush Menat
ee3036651a
fix: batch_no filtering not working when batch no is also a number in scientific notation (#30770) 
[skip ci]
 2022-04-21 16:34:31 +05:30
Ankush Menat
9734329094 test: discard local future SLE cache between tests 2022-04-19 17:40:28 +05:30
Ankush Menat
b24920c0e9 fix: correct sorting while updating bin 2022-04-19 17:38:36 +05:30
Ankush Menat
d2882ea436 test: use disposable item codes in tests 
dependency causes flake
 2022-04-19 17:38:36 +05:30
Ankush Menat
8f519545b0 test: repost queue progress 2022-04-19 17:38:36 +05:30