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

5715 Commits

Author SHA1 Message Date
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
Sagar Sharma
68c21d9895 feat: Add fields "subcontracting_order" and "sco_rm_detail" in SE and SE Detail 2022-05-20 10:45:33 +05:30
Sagar Sharma
77db843692 refactor!: Make required changes to create SCO from PO 2022-05-20 10:45:30 +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
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
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
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