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

35055 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
825850a58f fix: not able to save material request 2021-03-31 23:55:06 +05:30
Marica
b4913e7db4
Merge pull request #23509 from AndyOverLord/patch-7 
fix: Update Bin via Update Item on Purchase/Sales Order
 2021-03-31 22:28:14 +05:30
Marica
bfc2590e3b
Merge branch 'develop' into patch-7 2021-03-31 22:23:23 +05:30
Prssanna Desai
f3c34aa6ae
fix: don't set "Company:company:default_currency" as default for currency link fields (#25095) 
* fix: don't set Company:company:default_currency as default for currency link fields

* fix: Company:company:default_currency and refactor

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Afshan <afshan13k@gmail.com>
 2021-03-31 21:52:48 +05:30
marination
7665a85039 fix: Run Patches to updated Reserved, Requested and Ordered Qty 2021-03-31 21:03:55 +05:30
Marica
7d3eda47b4
Merge pull request #25063 from ankush/mr_stopped_validation 
fix: do not fetch stopped MR in production plan
 2021-03-31 20:10:54 +05:30
Deepesh Garg
9f7bb14ea1 fix: Remove console 2021-03-31 20:01:00 +05:30
Anuja P
a1d0932093 fix: suggested changes 2021-03-31 19:59:28 +05:30
Deepesh Garg
2d86eb3ab1 fix: Hide serial and batch selector in Stock Entry 2021-03-31 19:57:50 +05:30
Ankush Menat
777745f1e0
fix: do not fetch stopped MR in production plan 
- Ignore stopped MR while using fetch button
- Add filter on field inside child table.

Related issue: ISS-20-21-10757
 2021-03-31 19:53:19 +05:30
Anupam Kumar
1033cf72f6
fix: added flag for dont_fetch_price_list_rate in transaction (#25041) 2021-03-31 19:39:45 +05:30
Anuja P
fb9ce3f37b fix: Picked Qty conversion from Stock Qty to item Qty in DN 2021-03-31 19:26:42 +05:30
Sagar Vora
27f48739d4
test: pass force parameter to avoid LinkExistsError (#25100) 2021-03-31 18:49:03 +05:30
Sagar Vora
4e07695a08
test: use insert instead of save (#25045) 
* test: use insert instead of save

* test: use do_not_save
 2021-03-31 18:33:27 +05:30
Jannat Patel
11e9ae3841
fix: delivery note print error (#25080) 2021-03-31 16:24:08 +05:30
Prssanna Desai
45eccfafc1
fix: do not set standard link in Sales Invoice as custom (#25096) 2021-03-31 16:16:00 +05:30
Marica
116ac3cde7
Merge pull request #24863 from marination/drop-shipping 
fix: PO not created against all selected suppliers (drop shipping)
 2021-03-31 16:06:44 +05:30
Deepesh Garg
21a3ea462a
fix: Purchase from registered composition dealer (#25040) 
* fix: Purchase from registered composition dealer

* fix: Test case for GSTR 3b report
 2021-03-31 16:05:12 +05:30
Marica
1b8d36634f
Merge branch 'develop' into patch-7 2021-03-31 16:04:24 +05:30
Marica
8339987cf1
Merge branch 'develop' into drop-shipping 2021-03-31 16:03:14 +05:30
rohitwaghchaure
e353c84aa5
Merge pull request #25092 from rohitwaghchaure/fixed-multiply-issue-material-request-develop 
fix: can't multiply sequence by non-int of type 'float'
 2021-03-31 15:31:50 +05:30
Rohit Waghchaure
1bc53a32bf fix: can't multiply sequence by non-int of type 'float' 2021-03-31 15:30:42 +05:30
Rohan
99a8cb7143
fix: commit individual SLE rename for large datasets (#25084) 2021-03-31 15:22:00 +05:30
Marica
0af1aedf34
Merge branch 'develop' into drop-shipping 2021-03-31 15:05:11 +05:30
Saqib
0586b7db79
feat: discount configuration on early payments (#24586) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-03-31 15:03:53 +05:30
Deepesh Garg
5d73d8281b fix: Remove unintentionally added field 2021-03-31 14:10:56 +05:30
Deepesh Garg
f54d596ae1 fix: Precision issues while allocating advance amoount 2021-03-31 14:06:02 +05:30
Afshan
b07de03ddb fix: added blank option for status in report related to issue 2021-03-31 13:39:04 +05:30
Marica
5a601ce851
Merge branch 'develop' into drop-shipping 2021-03-31 13:12:13 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods (#25068) 
* chore: frappe.whitelist for doc methods

* fix: incorrect spelling

* fix: sider issue

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-31 12:30:32 +05:30
Marica
14c44e5e9e
Merge branch 'develop' into drop-shipping 2021-03-31 12:27:32 +05:30
marination
120da991d0 fix: Test 
- Preserve order of supplier list while removing duplicates
- Dont use list of set, but list of dict with unique keys
 2021-03-31 12:27:57 +05:30
Walstan Baptista
353aa59c42
test: sets company while making a project (#25061) 2021-03-31 12:16:54 +05:30
Walstan Baptista
d65458d534
test: corrected item name (#25075) 2021-03-31 12:14:41 +05:30
Marica
8451da7924
Merge branch 'develop' into drop-shipping 2021-03-31 11:44:07 +05:30
Anurag Mishra
720f69caaf
fix: column width in Recruitment analytics report (#25003) 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-03-31 11:23:34 +05:30
marination
0673f558c1 fix: Cleaned up and fixed validation and bin updation on deletion 
- Created separate smaller functions for validation and bin updation of deleted row
- Made sure previous doc (linked doc) was also updated after deletion of row
- Tests to check bin updation on add/update/delete
- Made reserved qty for subcontrating read only in bin
 2021-03-31 01:42:18 +05:30
Marica
c5739957de
Merge branch 'develop' into patch-7 2021-03-30 18:07:32 +05:30
Anurag Mishra
679177f9e0
Merge pull request #25022 from shariquerik/employee-profile-pic-access-fix 
fix: Employee profile pic upload access for erpnext user
 2021-03-30 14:32:21 +05:30
Rucha Mahabal
30f67c3f57
fix: add filters to account link fields in Non Profit Settings (#25060) 
- fetch memberships ordered by date in certificate
 2021-03-30 12:39:56 +05:30
Deepesh Garg
f954ec7c78 fix: Add patch for GST category field in Delivery Note 2021-03-29 20:31:11 +05:30
Sagar Vora
ba76f87e44
fix(Italy): setup, validations, optimisations (#25054) 
* fix(Italy): setup, validations, optimisations

* fix: remove unused import
 2021-03-29 20:18:45 +05:30
Deepesh Garg
29997414ad fix: Add GST category field in Dellivery Note 2021-03-29 19:49:52 +05:30
Sagar Vora
5c907fa7f0
test: make Stock Entry to avoid NegativeStockError (#25044) 2021-03-27 20:30:26 +05:30
Walstan Baptista
ee822a9dcd
test: use different product attribute value; cleanup (#25043) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-27 19:42:25 +05:30
Walstan Baptista
d6c7d8e631
test: reset session user if test errors in test_sle (#25042) 2021-03-27 18:30:07 +05:30
Sagar Vora
868c0bf45b
perf: reduce no of queries for checking if future sl entry exists (#24881) 2021-03-27 16:10:20 +05:30
walstanb
ab673d9e4b fix: minor changes 2021-03-27 12:54:49 +05:30
walstanb
225c64a1ad test: sets is_purchase_item while item creation 2021-03-27 12:54:49 +05:30
walstanb
52403c537b fix: check if gst account exists before appending 2021-03-27 12:54:49 +05:30