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

5505 Commits

Author SHA1 Message Date
Devin Slauenwhite
494bbf0124 feat: add checkbox to reserve qty on sales return 2022-06-17 13:51:33 -04:00
Devin Slauenwhite
f3f26d2c78 refactor: get_reserved_qty query builder 2022-06-17 11:51:21 -04:00
Devin Slauenwhite
d259c2e36a fix: merge conflict 2022-06-17 11:50:54 -04:00
Devin Slauenwhite
f39422afd8 Merge branch 'develop' into fix-reserve-qty 
# Conflicts:
#	erpnext/patches.txt
#	erpnext/public/js/utils/barcode_scanner.js
#	erpnext/regional/report/gstr_1/gstr_1.py
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py
 2022-06-17 08:04:52 -04: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
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
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
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
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
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
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
Ankush Menat
6d6616dbcd
fix: always update item_name for stock entry (#31068) 
If item_name is already set and for some reason becomes outdated then
it's not updated in backend.

Fix: always set item_name and stock_uom when fetching item details
 2022-05-19 14:25:47 +05:30
Devin Slauenwhite
5a402a5709 fix(test): use unique item in sales order. 2022-05-17 13:32:26 -04:00
marination
e07ce6efe0 fix: Job Card excess transfer behaviour 
- Block excess transfer of items if not allowed in settings
- Behaviour made consistent with js behaviour (button disappears if not pending and not allowed in settings)
- Test for same case
 2022-05-17 17:39:45 +05:30
Devin Slauenwhite
4d0fa85a75 fix(test): update_prevdoc_status 2022-05-16 19:45:59 -04:00
Devin Slauenwhite
47f867b77a test: don't reserve qty on sales return. 2022-05-16 14:27:45 -04:00
Devin Slauenwhite
1d1c975da1 Merge remote-tracking branch 'upstream/develop' into fix-reserve-qty 2022-05-16 11:10:28 -04:00
Ankush Menat
3714e36b44
fix: disable pricing rules for internal transfers (#31034) 
* fix: disable pricing rules for internal transfers

* fix: only apply validation on internal transfers

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

* fix: internal_party_field undefined

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-05-16 18:09:14 +05:30
Marica
06c036f49f
Merge pull request #30834 from ankush/transfer_precision 
fix: precision loss when transferring
 2022-05-16 16:00:06 +05:30
Ankush Menat
6bd1cb9235 fix: remove item attribute limit from variant selector 2022-05-16 12:28:52 +05:30
Ankush Menat
80d959c579
fix: dont fail repost for recoverable errors (#30979) 
recoverable erros:
1. timeout
2. lock/deadlocks
 2022-05-16 11:23:35 +05:30
Deepesh Garg
34de20f6ee
Merge pull request #30987 from ankush/internal_transfer_with_margin 
fix: prevent bypassing forced valuation rate
 2022-05-15 20:49:55 +05:30
Devin Slauenwhite
695e2bcfbc fix: don't reserve qty on sales return. 2022-05-14 11:06:24 -04:00
Ankush Menat
b08180092e
fix(patch): avoid checking for return field if it doesnt exits (#30995) 
fix(patch): avoid checking for qty field if it doesnt exits
 2022-05-13 11:55:47 +05:30
Ankush Menat
ee0a277540 fix: prevent bypassing forced valuation rate 
if you edit "margin_rate_or_amount" after saving DN then based on
selected margin the rate gets updated which isn't valuation rate.
 2022-05-12 19:01:26 +05:30
Marica
5b8c7438cc
Merge pull request #30945 from ankush/stock_analytics_fix 
fix: stock analytics report shows incorrect data there's no stock movement in a period
 2022-05-12 12:26:54 +05:30
Ankush Menat
b1c90e9949 fix: stock transfer value when precision differs 2022-05-12 11:09:30 +05:30
Marica
3d96ad2afa
Merge pull request #30950 from marination/actual-qty-total-js-reactive 
fix: Set actual qty and basic rate in SE on warehouse triggers (`get_warehouse_details`)
 2022-05-11 20:13:54 +05:30
Ankush Menat
2f1d118f36 fix: disable serial no scanning for picklist 
Current design of picklist doc doesn't have "picked serial no" so it
doesn't make much sense to scan it. Instead it should increment qty
only. Might add this in future after fixing UX problems
 2022-05-11 18:56:22 +05:30
Ankush Menat
372d2d870e fix: better message for picked qty shortfall 2022-05-11 18:43:10 +05:30
Ankush Menat
d3121fd845 fix(UX): hide scan section for non-draft docs 2022-05-11 18:40:44 +05:30
Ankush Menat
a4f0be6c5e Merge branch 'develop' into feat-picklist-scan 2022-05-11 18:38:53 +05:30
Marica
d024f72ab8
Merge branch 'develop' into actual-qty-total-js-reactive 2022-05-11 18:02:20 +05:30