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

47792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
66156fcfa7
Merge pull request #40031 from frappe/mergify/bp/version-15/pr-39983 
fix: Issues regarding asset cancellation and deletion (backport #39983)
 2024-02-26 13:02:20 +05:30
Nabin Hait
fc565ecd99
fix: resolved conflict 2024-02-26 12:21:57 +05:30
Nabin Hait
d196aa5a36
fix: resolved conflict 2024-02-26 12:21:25 +05:30
Gursheen Kaur Anand
e68d2d1c7a
Merge pull request #40109 from frappe/mergify/bp/version-15-hotfix/pr-40105 
fix(minor): tax amount label according to party type (backport #40105)
 2024-02-26 11:10:08 +05:30
Gursheen Kaur Anand
93f64396ac
Merge pull request #40111 from frappe/mergify/bp/version-15-hotfix/pr-40062 
fix: sales person / partner achieved targets in report (backport #40062)
 2024-02-26 11:08:15 +05:30
Gursheen Anand
91c21d13e5 test: sales person target variance 
(cherry picked from commit 7566c1ee78)
 2024-02-26 05:09:45 +00:00
Gursheen Anand
38abfdb8ae feat: show contributed qty in transaction summary 
(cherry picked from commit a823f16dff)
 2024-02-26 05:09:45 +00:00
Gursheen Anand
194f46be57 fix: only consider contributed qty towards achieved targets 
(cherry picked from commit 339698d172)
 2024-02-26 05:09:45 +00:00
Gursheen Anand
d541ba3e61 fix: amount label according to party type 
(cherry picked from commit 9c8d103d8a)
 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 75f8464724)

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 3c3c57c674)
 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 406793a6ff)
 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 4c9048fb39)

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 44ed52c5cf)

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 635174f1ce)
 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 467c0898e9)
 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 17452b7693)
 2024-02-23 08:51:38 +00:00
Gursheen Anand
cd42089e20 fix: skip SO & DN validation for debit note 
(cherry picked from commit e2d16955dd)
 2024-02-23 07:28:38 +00:00
Gursheen Anand
3b96aaeead fix: skip max discount validation for rate adjustment 
(cherry picked from commit 5a3b133d65)
 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 146c5b3e16)
 2024-02-23 07:10:08 +00:00
Gursheen Anand
190bd45bd7 fix: delete PLE containing invoice in against 
(cherry picked from commit c1e1fd8829)
 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 3634c4c284)
 2024-02-23 00:33:08 +00:00
ruthra kumar
2c8ba892ac test: ledger entries of Cr Note of POS Invoice 
(cherry picked from commit 4288713abe)
 2024-02-23 00:33:07 +00:00
ruthra kumar
2e07b03307 fix: Cr/Dr notes with POS Payments 
(cherry picked from commit 68a23730f3)
 2024-02-23 00:33:07 +00:00
Nihantra C. Patel
0be520331c fix: remove cancelled payment entry from PPBOID report 
(cherry picked from commit 186cc3d748)
 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 a2a8a8f2e0)
 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 c5050c935b)
 2024-02-22 14:54:53 +00:00
Frappe PR Bot
f723d7b561 chore(release): Bumped to Version 15.14.6 
## [15.14.6](https://github.com/frappe/erpnext/compare/v15.14.5...v15.14.6) (2024-02-22)

### Bug Fixes

* communication_date in party dashboards (backport [#40005](https://github.com/frappe/erpnext/issues/40005)) ([#40043](https://github.com/frappe/erpnext/issues/40043)) ([6662c32](6662c321a5))
 2024-02-22 11:14:07 +00:00
mergify[bot]
6662c321a5
fix: communication_date in party dashboards (backport #40005) (#40043) 
fix: accommodate for changed orderby statement

(cherry picked from commit 87df7ff717)

Co-authored-by: Gursheen Anand <gursheen@frappe.io>
 2024-02-22 16:40:46 +05:30
mergify[bot]
4269ef8c98
fix: communication_date in party dashboards (backport #40005) (#40021) 
fix: accommodate for changed orderby statement

(cherry picked from commit 87df7ff717)

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 38e88db2c9)

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 da184d709b)

# 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
3c98368e45 fix: removed unwanted patch 
(cherry picked from commit 85471533e9)
 2024-02-22 05:40:58 +00:00
Nabin Hait
6fc4dac4db fix: Issues regarding asset cancellation and deletion 
(cherry picked from commit 17f85de6fb)

# Conflicts:
#	erpnext/assets/doctype/asset/depreciation.py
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
 2024-02-22 05:40:57 +00:00
Frappe PR Bot
afc87a4486 chore(release): Bumped to Version 15.14.5 
## [15.14.5](https://github.com/frappe/erpnext/compare/v15.14.4...v15.14.5) (2024-02-22)

### Bug Fixes

* check for pricing rules on item ([5084b9b](5084b9bd4b))
 2024-02-22 05:38:47 +00:00
Deepesh Garg
5137966fe5
Merge pull request #40030 from frappe/mergify/bp/version-15/pr-40019 
fix: TypeError for item pricing rules (#39999)
 2024-02-22 11:07:32 +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
Gursheen Anand
5084b9bd4b fix: check for pricing rules on item 
(cherry picked from commit ecd83b12ab)
(cherry picked from commit 32d9642379)
 2024-02-22 05:36:43 +00:00
mergify[bot]
eaa3849df4
fix: remove microsecond from posting datetime (backport #40017) (#40022) 
fix: remove microsecond from posting datetime (#40017)

(cherry picked from commit 0b04d04da3)

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 864d7ae04c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-22 09:50:45 +05:30