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

47725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gursheen Anand
d541ba3e61 fix: amount label according to party type 
(cherry picked from commit 9c8d103d8af85e52095071d43d8b8a03bdbf3255)
 2024-02-26 05:05:27 +00:00
mergify[bot]
27703b54bd
fix: capacity planning issue in the job card (backport #40092) (#40101) 
fix: capacity planning issue in the job card (#40092)

* fix: capacity planning issue in the job card

* test: test case to test capacity planning for workstation

(cherry picked from commit 75f8464724382ac703a16ee3fd73de2c9bb56d13)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-25 19:22:51 +05:30
ruthra kumar
9ffbf5623a
Merge pull request #40097 from frappe/mergify/bp/version-15-hotfix/pr-40096 
fix: Fiscal Year exception on demo data setup (backport #40096)
 2024-02-25 16:09:51 +05:30
ruthra kumar
56ee843233 fix: Fiscal Year exception on demo data setup 
(cherry picked from commit 3c3c57c674e180dc6ea7617c11cfc0d86e8e641f)
 2024-02-25 10:13:09 +00:00
ruthra kumar
383dfdd4ab
Merge pull request #40091 from frappe/mergify/bp/version-15-hotfix/pr-40073 
refactor: update payments section on item removal (backport #40073)
 2024-02-25 09:34:42 +05:30
ruthra kumar
5c269a9947 refactor: update payments section on item removal 
(cherry picked from commit 406793a6ff2f4e9aef9fc30d20fa2c3b81ca2f50)
 2024-02-25 03:58:19 +00:00
mergify[bot]
cf5fa210bb
fix: do not make MR against raw materials of available sub assemblies (backport #40085) (#40087) 
fix: do not make MR against raw materials of available sub assemblies (#40085)

(cherry picked from commit 4c9048fb3960668edd63a6e716b26d2e444bc1f9)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-24 21:02:17 +05:30
mergify[bot]
53d943ec70
fix: Cannot read properties of undefined (backport #40081) (#40083) 
fix: Cannot read properties of undefined

(cherry picked from commit 44ed52c5cfa6a2432769bbb6f3c352aa81025de2)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2024-02-24 17:04:36 +05:30
rohitwaghchaure
d755b9d38c
Merge pull request #40080 from frappe/mergify/bp/version-15-hotfix/pr-40079 
chore: change label name (backport #40079)
 2024-02-24 13:29:04 +05:30
Rohit Waghchaure
824df72eeb fix: change label name 
(cherry picked from commit 635174f1cee1e421bfb7c724acc2219f928af2ef)
 2024-02-24 07:40:56 +00:00
Gursheen Kaur Anand
e4baacd79e
Merge pull request #40066 from frappe/mergify/bp/version-15-hotfix/pr-40040 
fix: skip max discount validation for rate adjustment (backport #40040)
 2024-02-23 15:10:38 +05:30
Gursheen Kaur Anand
38b384dfa2
Merge pull request #40064 from frappe/mergify/bp/version-15-hotfix/pr-40035 
fix: delete PLE containing invoice in against (backport #40035)
 2024-02-23 15:07:48 +05:30
ruthra kumar
10fe201bc8
Merge pull request #40068 from frappe/mergify/bp/version-15-hotfix/pr-39830 
fix: check_credit_limit on_update_after_submit of Sales Order (backport #39830)
 2024-02-23 14:48:08 +05:30
ruthra kumar
bcb280c5e8 test: credit limit on update after submit 
(cherry picked from commit 467c0898e9a2e4fb84049a3a3a20d3aa63c7f5a0)
 2024-02-23 08:51:39 +00:00
Nihantra C. Patel
83d7111649 fix: check_credit_limit on_update_after_submit of Sales Order 
(cherry picked from commit 17452b76933e7edb087741671f876782d0a70859)
 2024-02-23 08:51:38 +00:00
Gursheen Anand
cd42089e20 fix: skip SO & DN validation for debit note 
(cherry picked from commit e2d16955dd6de197ef621e5f8fb3159f5a9bfaaa)
 2024-02-23 07:28:38 +00:00
Gursheen Anand
3b96aaeead fix: skip max discount validation for rate adjustment 
(cherry picked from commit 5a3b133d6520661fe28e4c2d73c17ef4eb48be1e)
 2024-02-23 07:28:37 +00:00
Ankush Menat
83b4cc5091
build: specify frappe dependency (#40061) 
build: specify frappe dependency 

Added 15.10 as dependency because stock balance depends on https://github.com/frappe/frappe/pull/24346
 2024-02-23 12:43:01 +05:30
Gursheen Anand
a75a69a01e fix: only check for delinked PLEs 
(cherry picked from commit 146c5b3e16b0521f0590aa6dfa957979fc6f3d9a)
 2024-02-23 07:10:08 +00:00
Gursheen Anand
190bd45bd7 fix: delete PLE containing invoice in against 
(cherry picked from commit c1e1fd882950352c61e5881076c34fe3436142c6)
 2024-02-23 07:10:08 +00:00
ruthra kumar
c752bec2d9
Merge pull request #40058 from frappe/mergify/bp/version-15-hotfix/pr-40011 
fix: Ledger entries for Cr/Dr notes with POS Payments (backport #40011)
 2024-02-23 06:20:30 +05:30
ruthra kumar
8fef484f0f
Merge pull request #40056 from frappe/mergify/bp/version-15-hotfix/pr-39831 
fix: remove cancelled payment entry from Payment Period Based On Invoice Date (backport #39831)
 2024-02-23 06:20:14 +05:30
ruthra kumar
b40baf5e63 refactor: skip popup for POS invoices 
(cherry picked from commit 3634c4c284061ecd2fe5576467238532f748b07a)
 2024-02-23 00:33:08 +00:00
ruthra kumar
2c8ba892ac test: ledger entries of Cr Note of POS Invoice 
(cherry picked from commit 4288713abe2e614e2454589fd5e344ba87f38fe1)
 2024-02-23 00:33:07 +00:00
ruthra kumar
2e07b03307 fix: Cr/Dr notes with POS Payments 
(cherry picked from commit 68a23730f3fde5d8f306d77c3db5e373b1c6e937)
 2024-02-23 00:33:07 +00:00
Nihantra C. Patel
0be520331c fix: remove cancelled payment entry from PPBOID report 
(cherry picked from commit 186cc3d7488b126ce5d2d6d2f9095f138fd44de3)
 2024-02-23 00:30:50 +00:00
Nihantra C. Patel
72da3083e6 fix: remove cancelled payment entry from Payment Period Based On Invoice Date 
(cherry picked from commit a2a8a8f2e0c7ca3f62c31ac8834e5a6053aeb87d)
 2024-02-23 00:30:50 +00:00
ruthra kumar
a3ddd326d6
Merge pull request #40049 from frappe/mergify/bp/version-15-hotfix/pr-39828 
fix: translate Sales Pipeline Analytics report (backport #39828)
 2024-02-22 20:46:55 +05:30
Nihantra C. Patel
1c5a7e29f2 fix: translatable columns in Sales Pipeline Analytics report 
(cherry picked from commit c5050c935bb75c5fdf10be4dfea16557da90b487)
 2024-02-22 14:54:53 +00:00
mergify[bot]
4269ef8c98
fix: communication_date in party dashboards (backport #40005) (#40021) 
fix: accommodate for changed orderby statement

(cherry picked from commit 87df7ff71772474bb858dac6ce9132280ce2ab82)

Co-authored-by: Gursheen Anand <gursheen@frappe.io>
 2024-02-22 16:20:02 +05:30
mergify[bot]
a543bf47ef
fix: timesheet per billed state edge case (backport #40010) (#40029) 
fix: timesheet per billed state edge case (#40010)

If value is 100.0000x then it won't set status correctly but will set it the next time it's loaded from db.

(cherry picked from commit 38e88db2c9245a3fec392941d2937cace7bf8e5f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2024-02-22 12:29:53 +05:30
mergify[bot]
c964c45f4e
fix: negative stock error while making stock reconciliation (backport #40016) (#40026) 
* fix: negative stock error while making stock reconciliation (#40016)

fix: negative stock error while making stock reco
(cherry picked from commit da184d709b9f61bc9bd62cd6beddf5e19c661042)

# Conflicts:
#	erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-22 11:38:49 +05:30
Nabin Hait
6f364df48c
Merge pull request #39990 from frappe/mergify/bp/version-15-hotfix/pr-39983 
fix: Issues regarding asset cancellation and deletion (backport #39983)
 2024-02-22 11:07:01 +05:30
mergify[bot]
eaa3849df4
fix: remove microsecond from posting datetime (backport #40017) (#40022) 
fix: remove microsecond from posting datetime (#40017)

(cherry picked from commit 0b04d04da3bb876080cfc25b8cd889416295ea8f)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-22 09:51:07 +05:30
mergify[bot]
9f8f3db953
fix: incorrect item name in MR (backport #40018) (#40024) 
fix: incorrect item name in MR (#40018)

(cherry picked from commit 864d7ae04c3a2992f94eafb47060468f0cfb3c9c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-22 09:50:45 +05:30
Gursheen Kaur Anand
43c218c673
Merge pull request #40019 from frappe/mergify/bp/version-15-hotfix/pr-39999 
fix: TypeError for item pricing rules (backport #39999)
 2024-02-22 09:10:17 +05:30
Gursheen Anand
32d9642379 fix: check for pricing rules on item 
(cherry picked from commit ecd83b12abb19e0e41a50e914a89b320e1f577eb)
 2024-02-22 03:37:17 +00:00
mergify[bot]
b9181e85dc
perf: new column Posting Datetime in SLE to optimize stock ledger related queries (backport #39800) (#40004) 
* perf: new column posting datetime in SLE to optimize stock ledger related queries

(cherry picked from commit d80ca523a43e9d1073dc008ead7d140fb0811a89)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py

* test: test cases to test clash timestamp entries

(cherry picked from commit f04676aaed69d669e43099077c85d93fedbf7e07)

* chore: remove microsecond from posting_datetime

(cherry picked from commit a73ba2c0d26b9d27bb5a75bc6c9739e49035f266)

* chore: fix conflicts

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2024-02-21 21:14:28 +05:30
rohitwaghchaure
66a05087b8
Merge pull request #40001 from frappe/mergify/bp/version-15-hotfix/pr-39998 
fix: Completed Work Orders report not working (backport #39998)
 2024-02-21 17:44:44 +05:30
Rohit Waghchaure
ca03e9cfd3 fix: Completed Work Orders report not working 
(cherry picked from commit 11f4cb914a665bbfba61ec76059c8eba48a467be)
 2024-02-21 11:21:04 +00:00
Nabin Hait
692867427c
fix: resolved conflict 2024-02-21 11:38:21 +05:30
Nabin Hait
a0c0ab7709
fix: resolved conflict 2024-02-21 11:37:47 +05:30
Nabin Hait
ee2d108bef fix: removed unwanted patch 
(cherry picked from commit 85471533e9fa59b76d81613fad242e5365cbc9f7)
 2024-02-21 05:45:27 +00:00
Nabin Hait
8eb2f67910 fix: Issues regarding asset cancellation and deletion 
(cherry picked from commit 17f85de6fb6fbcd26993768b9fd29822189626d2)

# Conflicts:
#	erpnext/assets/doctype/asset/depreciation.py
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
 2024-02-21 05:45:27 +00:00
rohitwaghchaure
ed553b89a4
Merge branch 'version-15' into version-15-hotfix 2024-02-21 09:34:20 +05:30
mergify[bot]
2ee51d36ff
fix: set batch created from bundle to batch field in stock transaction (backport #39966) (#39987) 
fix: set batch created from bundle to batch field in stock transaction (#39966)

* fix: set batch created from bundle to batch field in stock transaction

* fix: validation for serial and batch no

(cherry picked from commit 4b24fcd2216caadbec402fc7d1e412bdcc662dad)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-21 00:04:01 +05:30
mergify[bot]
0f87ec15ad
fix: 'NoneType' object is not iterable (backport #39977) (#39981) 
fix: 'NoneType' object is not iterable (#39977)

(cherry picked from commit 8e7d47b3a7453ce7ded83c4205c556716f2afa19)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-20 15:53:12 +05:30
mergify[bot]
720144898f
fix: show active bom in the dropdown while making stock entry and MR (backport #39974) (#39976) 
fix: show active bom in the dropdown while making stock entry and MR (#39974)

(cherry picked from commit 133f8bd92a33fb15d1ababf8b5f1d4f061426538)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-20 13:13:00 +05:30
mergify[bot]
46f7569a54
fix: reposting failed status not updated (backport #39970) (#39972) 
fix: reposting failed status not updated (#39970)

(cherry picked from commit d4264f7ba12322f05f7f8128fd5a1cd8bc6eb231)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-20 12:35:46 +05:30
rohitwaghchaure
a102172982
Merge pull request #39968 from frappe/mergify/bp/version-15-hotfix/pr-39967 
fix: float division by zero (backport #39967)
 2024-02-20 12:07:38 +05:30