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

5626 Commits

Author SHA1 Message Date
rohitwaghchaure
60dbd6a246
Merge pull request #31631 from rohitwaghchaure/slow-stock-reposting-issue 
fix: slow stock reposting
 2022-07-19 18:47:23 +05:30
Rohit Waghchaure
1d80d37ccf fix: slow stock reposting 2022-07-19 16:36:22 +05:30
Marica
2a2db8c64a
Merge branch 'develop' into lcv-future-stock-update 2022-07-19 12:53:51 +05:30
Devin Slauenwhite
1e20358c28 fix: sum stock_value and group by warehouse 2022-07-14 18:53:50 -04:00
Devin Slauenwhite
bc3023318e chore: remove unused import 2022-07-14 18:09:52 -04:00
Devin Slauenwhite
73ade04dcf pref: reduce count of db calls from n to 2 2022-07-14 18:09:08 -04:00
Devin Slauenwhite
0a633a212d fix: display customer name on picking list 2022-07-12 13:05:40 -04:00
Rucha Mahabal
d8aa1c59f1
Merge branch 'develop' into hr-separation 2022-07-12 19:27:19 +05:30
marination
de9ea70ce3 test: LCV impact on future stock balancees 2022-07-12 13:00:00 +05:30
Ankush Menat
2224b6503b
chore: typo 
[skip ci]
 2022-07-12 12:39:22 +05:30
Ankush Menat
4ec85cb2f0
test: don't silently fail reposts in tests (#31559) 2022-07-08 19:28:03 +05:30
Rucha Mahabal
ef02e58859 Merge branch 'develop' into hr-separation 2022-07-07 13:46:54 +05:30
Sagar Sharma
f9885746a8
Merge branch 'develop' into subcontracting 2022-07-07 09:56:23 +05:30
rohitwaghchaure
96f46b220b
Merge branch 'develop' into fixed-time-out-error-reposting 2022-07-05 19:23:46 +05:30
Deepesh Garg
37f7801cfb
Merge pull request #29884 from resilient-tech/remove-india 
refactor: remove India specific code
 2022-07-05 18:50:41 +05:30
Rohit Waghchaure
78c8bb251e fix: timeout error while reposting 2022-07-05 18:45:13 +05:30
rohitwaghchaure
d5b0b5e798
Merge pull request #31523 from rohitwaghchaure/fixed-test-case-backflushed_batch-raw-materials 
fix: test case
 2022-07-05 15:10:59 +05:30
Rohit Waghchaure
7282c8e65b fix: test case 2022-07-05 15:10:28 +05:30
Sagar Sharma
f75d35ed60
Merge branch 'develop' into subcontracting 2022-07-05 11:25:08 +05:30
Deepesh Garg
60aad31162 fix: Incorrect provisional expense booking while reposting 2022-07-04 18:38:26 +05:30
marination
7a5fd71a6c fix: LCV updates wrong future qty/Bin qty 
- As -ve LCV SLE case is returned from `repost_current_voucher`, future qty is not updated
- This just doubly shifts all future qty which is then fixed by a repost
- Until the repost balance values are wrong
- Bin continues to show wrong projected qty even after repost, this is fixed by next SLE that recalculates Bin
 2022-07-04 17:46:54 +05:30
Sagar Vora
05351bee8b Merge remote-tracking branch 'upstream/develop' into remove-india 2022-07-03 18:07:44 +05:30
Sagar Sharma
fd162f9b14 fix: supplier warehouse in PR 2022-07-01 16:51:19 +05:30
Sagar Sharma
6589c5f5e9
Merge branch 'develop' into subcontracting 2022-06-29 17:29:24 +05:30
Rucha Mahabal
ef63c61ebd
Merge branch 'develop' into hr-separation 2022-06-29 12:35:51 +05:30
Devin Slauenwhite
cdf631b9de
fix: validate item dashboard material transfer entry (#31473) 2022-06-29 12:06:47 +05:30
Sagar Sharma
78ff1783b1 Merge branch 'develop' into subcontracting 2022-06-28 22:20:32 +05:30
Rucha Mahabal
6a65c8aff4 Merge branch 'develop' into hr-separation 2022-06-28 11:51:59 +05:30
Sagar Vora
0810674c8a Merge remote-tracking branch 'upstream/develop' into remove-india 2022-06-24 13:08:40 +05:30
Rucha Mahabal
edb528ce41 chore: Remove code for Expense Claim from Project, Task, Delivery Trip 
- Remove `total_expense_claim` field from Project and Task, will be installed with hrms setup

- Remove Expense Claim calculation from `update_costing` in project

- Remove `update_total_expense_claim` from task

- Remove Expense Claim references from employee form tour

- Remove 'Make Expense Claim' button from Delivery Trip, will only be available if hrms is installed

- Update delivery trip tests
 2022-06-23 19:48:42 +05:30
rohitwaghchaure
186224a12a
Merge branch 'develop' into fixed-transferred-materials-are-not-consumed 2022-06-21 22:45:05 +05:30
Sagar Sharma
912d26361d
Merge branch 'develop' into fixed-transferred-materials-are-not-consumed 2022-06-21 13:23:37 +05:30
Deepesh Garg
f572c20009
Merge branch 'develop' into internal_trasfer_precision_loss 2022-06-21 10:45:02 +05:30
s-aga-r
f6ef3068d7 Merge branch 'develop' into subcontracting 2022-06-20 23:10:31 +05:30
s-aga-r
6d89b2fa28 refactor: backport old subcontracting code 2022-06-20 23:10:02 +05:30
Sagar Vora
ec9861266e Merge remote-tracking branch 'upstream/develop' into remove-india 2022-06-19 22:57:22 +05:30
Conor
ea28ed1bb3
refactor: if() to CASE WHEN (#31360) 
* refactor: if() to CASE WHEN

* fix: remove duplicate order by

* fix: remove extraneous table

* style: reformat to black spec

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-17 21:17:48 +05:30
Conor
74a782d81d
refactor: DB independent quoting and truthy/falsy values (#31358) 
* refactor: DB independent quoting and truthy/falsy values

* style: reformat to black spec

* fix: ifnull -> coalesce

* fix: coalesce -> Coalesce

* fix: revert pypika comparison

* refactor: convert queries to QB

* fix: incorrect value types for query

`=` query makes no sense with list of values

* fix: remove warehouse docstatus condition

* fix: keep using base rate as rate

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-17 17:01:27 +05:30
s-aga-r
ca24b5287e chore: make "is_subcontracted" field read-only in PR and PI 2022-06-17 16:47:49 +05:30
s-aga-r
5002f1f1e5 feat: Add hidden field "is_old_subcontracting_flow" in PO, PR and PI 2022-06-17 16:47:41 +05:30
Marica
d6078aa911
fix: Respect system precision for user facing balance qty values (#30837) 
* fix: Respect system precision for user facing balance qty values

- `get_precision` -> `set_precision`
- Use system wide currency precision for `stock_value`
- Round of qty defiiciency as per user defined precision (system flt precision), so that it is WYSIWYG for users

* fix: Consider system precision when validating future negative qty

* test: Immediate Negative Qty precision test

- Test for Immediate Negative Qty precision
- Stock Entry Negative Qty message: Format available qty in system precision
- Pass `stock_uom` as confugrable option in `make_item`

* test: Future Negative Qty validation with precision

* fix: Use `get_field_precision` for currency precision as it used to

- `get_field_precision` defaults to number format for precision (maintain old behaviour)
- Don't pass `currency` to `get_field_precision` as its not used anymore
 2022-06-17 15:13:13 +05:30
Ankush Menat
74007c8e91
fix(UX): hide irrelevant UOM fields (#31392) 
fix(UX): hide UOM-related fields if they are inconsequential
 2022-06-17 15:10:21 +05:30
rohitwaghchaure
2ec133df6d
Merge branch 'develop' into fixed-transferred-materials-are-not-consumed 2022-06-17 15:02:07 +05:30
Sagar Vora
1a3997a566
fix: transaction date gets unset in material request (#31327) 
* fix: set date correctly in material request

* fix: use only `transaction_date` in `get_item_details`
 2022-06-16 22:33:47 +05:30
Ankush Menat
86919d2a6d
test: silent test failure in stock assertions (#31377) 
If actual values are not present then test is silently passing, # of
actual values should be at least equal to expected values.
 2022-06-15 21:19:09 +05:30
Ankush Menat
5c6f22f275
refactor: simpler batching for GLE reposting (#31374) 
* refactor: simpler batching for GLE reposting

* test: add "actual" test for chunked GLE reposting
 2022-06-15 19:30:26 +05:30
Rushabh Mehta
c0f9b34ede
fix(minor): move variants to separate tab (#31354) 
* fix(minor): move variants to separate tab

* fix(minor): variants tab

* fix(minor): add counts

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-15 16:08:05 +05:30
Marica
fafdaff4d4
Merge branch 'develop' into so-to-wo-bom 2022-06-15 12:58:13 +05:30
Conor
b8f728a40a
refactor: use CURRENT_DATE instead of CURDATE() (#31356) 
* refactor: use CURRENT_DATE instead of CURDATE()

* style: reformat to black spec

* refactor: use QB for auto_close queries

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-15 12:07:33 +05:30
Conor
2a9105f26f
refactor: DB independent capitalization of test cases (#31359) 2022-06-15 11:24:24 +05:30
rohitwaghchaure
a4c2c3e02f
Merge branch 'develop' into fixed-transferred-materials-are-not-consumed 2022-06-15 09:41:01 +05:30
Sagar Sharma
406114374b
Merge branch 'develop' into subcontracting 2022-06-14 06:44:29 -07:00
s-aga-r
9a68af36ec Merge branch 'develop' into subcontracting 2022-06-14 19:13:10 +05:30
Marica
639e4c5714
Merge branch 'develop' into so-to-wo-bom 2022-06-14 18:22:11 +05:30
Ankush Menat
2535d5edd0
perf: GLE reposting with progress and chunking (#31343) 
If stock voucher count goes >1000 then fetching all gles and reposting
them all at once requires much more memory and can cause crash.

- This PR ensures that GLE reposting is done in chunks of 100 vouchers.
- This PR also starts keeping track of how many such chunks were
  processed so in future progress is resumed in event of timeout.
 2022-06-14 18:20:33 +05:30
marination
9f2d325e67 fix: Pick Template BOM if variant BOM absent in WO popup from SO 
- Use `get_default_bom` in sales_order.py (reduce duplicate utility functions)
- Remove redundant if else in `get_work_order_items`
- `get_default_bom`: If no BOM and template exists try to fetch template BOM
- test: `get_work_order_items` via SO and if right BOM is picked
 2022-06-14 17:20:44 +05:30
Conor
00ef499739
refactor: use db independent offset syntax (#31345) 
* chore: use db independent offset syntax

* fix: typo

* style: reformat code to black spec

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-14 10:49:07 +05:30
marination
fa1d9d548e fix: Supplied Qty not updated on Stock Entry cancel 
- Loop over PO supplied items and update them as data from SE will exclude a row if supplied qty becomes 0 on cancel
- Use DB API insteaf of raw SQL
 2022-06-13 17:59:03 +05:30
Sagar Sharma
f755430098
Merge branch 'develop' into subcontracting 2022-06-13 03:00:53 -07:00
Ankush Menat
1646fbe478
refactor: remove add_fetch (#31315) 
- Sales Team already had fetch from set up
- Set up fetch from on sales partner in sales transaction

Reason for removal: the JS code applies arbitrarily to any field called "sales_person"
 2022-06-10 13:52:17 +05:30
Ankush Menat
65b21ee7d6 fix: internal transfer GLE validation 2022-06-08 19:26:40 +05:30
Rushabh Mehta
b29edb302c
Merge pull request #31284 from rmehta/item-form-cleanup 
fix(ux): Add tabs in Item
 2022-06-08 17:01:57 +05:30
Sagar Sharma
f7a52f76d4
Merge branch 'develop' into subcontracting 2022-06-08 04:27:24 -07:00
Rushabh Mehta
5c6937865c fix(ux): Add tabs in Item 2022-06-08 16:30:44 +05:30
Ankush Menat
7726271e2a fix: purchase invoice return GLe 
voucher_wise_stock_value contains tuples and the condition was looking
for string, so it's never triggered.

Caused by https://github.com/frappe/erpnext/pull/24200
 2022-06-07 12:08:20 +05:30
Ankush Menat
293eb8d722 test: create stock test mixin for assertion/utils 2022-06-07 11:35:51 +05:30
Rohit Waghchaure
d94ff3ede8 test: test cases to cover batch, serialized raw materials 2022-06-06 17:57:52 +05:30
Sagar Sharma
74fae72939
Merge branch 'develop' into subcontracting 2022-06-06 10:27:25 +05:30
Deepesh Garg
21de550549
Merge pull request #31219 from deepeshgarg007/group_filter_cost_center 
fix: Parent dimension filters in orders
 2022-06-06 08:58:40 +05:30
Rohit Waghchaure
333c62de72 fix: transferred batches are not fetched while making Manufacture stock entry 2022-06-06 01:19:58 +05:30
s-aga-r
992ba974e2 Merge branch 'develop' into subcontracting 2022-06-03 13:25:49 +05:30
Deepesh Garg
3f376cc3a5 fix: Parent dimension filters in orders 2022-06-02 13:57:54 +05:30
Ankush Menat
3974fbbb6e
feat: UOM specific barcodes (#30988) 2022-06-01 16:43:56 +05:30
maharshivpatel
b3ccc4bfb9
fix: Auto Insert Item Price If Missing when discount & blank UOM (#31168) 
* fix: Auto Insert Item Price If Missing when discount and blank UOM

fixes wrong item price insert when discount is used and adds uom=stock_uom instead of blank as price is converted to stock uom

* unit tests added for item with discount

I have added test  for auto_insert_price where discount is used.

* unit test issue fixed

fixed make_sales_order as some of the test that depended on it were failing due to passing of incorrect parameters.

Co-authored-by: Ankush Menat <me@ankush.dev>
 2022-05-31 19:48:30 +05:30
Ankush Menat
a1b7a7983a
refactor!: drop naming series tool (#31183) 2022-05-31 15:35:40 +05:30
Saqib Ansari
08bf0baaae
chore!: remove unused bill no & date from purchase receipt (#31163) 2022-05-30 14:50:50 +05:30
Ankush Menat
e3c0d0134e
Merge pull request #31101 from alyf-de/fix-warehouse-js 
fix: Improve button labels in Warehouse
 2022-05-26 18:14:49 +05:30
Ankush Menat
47b539e638
fix: skip existing batch number during autogen (#31140) 2022-05-26 16:20:56 +05:30
Sagar Sharma
bcaac8f90f
Merge branch 'develop' into subcontracting 2022-05-26 15:01:23 +05:30
Deepesh Garg
ac17ecb84b
Merge branch 'develop' into party_account_currency_check 2022-05-25 16:21:06 +05:30
Deepesh Garg
bc34737709 chore: Update test case 2022-05-25 15:42:47 +05:30
Sagar Sharma
4ff734c25a
Merge branch 'develop' into subcontracting 2022-05-25 12:32:33 +05:30
Devin Slauenwhite
55276f11f8
fix: don't fetch item_code if already exists. (#31113) 
fix: check if item_code exists before fetching
 2022-05-25 09:35:22 +05:30
barredterra
1e9f9c452f style: format 2022-05-24 13:31:29 +02:00
barredterra
1b16eb7667 refactor: set queries during setup 2022-05-24 13:30:59 +02:00
Raffael Meyer
e77c379cbb
fix: remove unsupported arguments 
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2022-05-24 11:52:23 +02:00
Ankush Menat
1ecb8f4a67 chore: disable feed for material request 2022-05-24 14:32:56 +05:30
Ankush Menat
ecb39d81e0
chore: error logging for auto material requests (#31103) 2022-05-23 20:06:24 +05:30
barredterra
a6ddd86d31 fix: improve labels, simplify logic 2022-05-23 15:25:00 +02:00
barredterra
c704ad889d style: format warehouse js 2022-05-23 15:18:24 +02:00
Ankush Menat
1a58b788e5 Merge branch 'develop' into jc-excess-transfer-config 2022-05-21 14:32:44 +05:30
Sagar Sharma
213113bc00 Merge branch 'develop' into subcontracting 2022-05-20 12:13:13 +05:30
Sagar Sharma
323bdf85ce feat: SL and GL reposting 2022-05-20 10:45:34 +05:30
Sagar Sharma
fcc09592b9 refactor!: Stock Ledger Entry 2022-05-20 10:45:34 +05:30
Sagar Sharma
6c794afbe7 refactor!: Item Alternative 2022-05-20 10:45:34 +05:30
Sagar Sharma
f09fc46059 refactor!: Purchase Receipt 2022-05-20 10:45:33 +05:30
Sagar Sharma
73484448f2 refactor!: Stock Entry 2022-05-20 10:45:33 +05:30
Sagar Sharma
70a1f40624 feat: New DocType "Subcontracting Receipt" 2022-05-20 10:45:33 +05:30
Sagar Sharma
409df263e8 refactor!: change "is_subcontracted" field type from "Select" to "Check" 2022-05-20 10:45:33 +05:30
Sagar Sharma
249726b845 feat: New DocType "Subcontracting Order" 2022-05-20 10:45:33 +05:30