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

47777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PAlexanderFranklin
f3da1b0747 change readme 2024-03-28 16:52:41 -07:00
PAlexanderFranklin
f42b734fd7 add unfinished ide setup file 2024-03-25 12:40:19 -07:00
PAlexanderFranklin
74acd730e3 Add git workflow 2024-03-25 12:40:01 -07:00
Frappe PR Bot
23011df86b chore(release): Bumped to Version 15.15.0 
# [15.15.0](https://github.com/frappe/erpnext/compare/v15.14.7...v15.15.0) (2024-02-28)

### Bug Fixes

* add flags for repost to ensure correct accounting from India Compliance App ([7d14ecf](7d14ecfcb8))
* amount label according to party type ([d541ba3](d541ba3e61))
* Cannot read properties of undefined (backport [#40081](https://github.com/frappe/erpnext/issues/40081)) ([#40083](https://github.com/frappe/erpnext/issues/40083)) ([53d943e](53d943ec70))
* capacity planning issue in the job card (backport [#40092](https://github.com/frappe/erpnext/issues/40092)) ([#40101](https://github.com/frappe/erpnext/issues/40101)) ([27703b5](27703b54bd))
* change label name ([824df72](824df72eeb))
* check for pricing rules on item ([32d9642](32d9642379))
* check_credit_limit on_update_after_submit of Sales Order ([83d7111](83d7111649))
* communication_date in party dashboards (backport [#40005](https://github.com/frappe/erpnext/issues/40005)) ([#40021](https://github.com/frappe/erpnext/issues/40021)) ([4269ef8](4269ef8c98))
* Completed Work Orders report not working ([ca03e9c](ca03e9cfd3))
* Cr/Dr notes with POS Payments ([2e07b03](2e07b03307))
* currency symbol in landed cost voucher and material request (backport [#40138](https://github.com/frappe/erpnext/issues/40138)) ([#40141](https://github.com/frappe/erpnext/issues/40141)) ([57bb031](57bb031602))
* Data too long for column 'serial_no' at row 1 (backport [#40098](https://github.com/frappe/erpnext/issues/40098)) ([#40139](https://github.com/frappe/erpnext/issues/40139)) ([9d19ec4](9d19ec43c8))
* default taxable value for item not found in item list ([7e43f6b](7e43f6b7e0))
* delete PLE containing invoice in against ([190bd45](190bd45bd7))
* do not make MR against raw materials of available sub assemblies (backport [#40085](https://github.com/frappe/erpnext/issues/40085)) ([#40087](https://github.com/frappe/erpnext/issues/40087)) ([cf5fa21](cf5fa210bb))
* Fiscal Year exception on demo data setup ([56ee843](56ee843233))
* incorrect item name in MR (backport [#40018](https://github.com/frappe/erpnext/issues/40018)) ([#40024](https://github.com/frappe/erpnext/issues/40024)) ([9f8f3db](9f8f3db953))
* Issues regarding asset cancellation and deletion ([8eb2f67](8eb2f67910))
* negative stock error while making stock reconciliation (backport [#40016](https://github.com/frappe/erpnext/issues/40016)) ([#40026](https://github.com/frappe/erpnext/issues/40026)) ([c964c45](c964c45f4e))
* on unreconciliation, update advance paid ([4d1f56c](4d1f56c4bd))
* only check for delinked PLEs ([a75a69a](a75a69a01e))
* only consider contributed qty towards achieved targets ([194f46b](194f46be57))
* parent warehouse checks in the production plan for sub-assemblies (backport [#40150](https://github.com/frappe/erpnext/issues/40150)) ([#40157](https://github.com/frappe/erpnext/issues/40157)) ([4784117](4784117a8f))
* remove cancelled payment entry from Payment Period Based On Invoice Date ([72da308](72da3083e6))
* remove cancelled payment entry from PPBOID report ([0be5203](0be520331c))
* remove config for default bank account in test ([36b442a](36b442a951))
* remove microsecond from posting datetime (backport [#40017](https://github.com/frappe/erpnext/issues/40017)) ([#40022](https://github.com/frappe/erpnext/issues/40022)) ([eaa3849](eaa3849df4))
* removed unwanted patch ([ee2d108](ee2d108bef))
* resolved conflict ([6928674](692867427c))
* resolved conflict ([a0c0ab7](a0c0ab7709))
* skip max discount validation for rate adjustment ([3b96aae](3b96aaeead))
* skip SO & DN validation for debit note ([cd42089](cd42089e20))
* Supplier users not able to see RFQ on the Portal (backport [#40161](https://github.com/frappe/erpnext/issues/40161)) ([#40165](https://github.com/frappe/erpnext/issues/40165)) ([6a63a6c](6a63a6c98a))
* timesheet per billed state edge case (backport [#40010](https://github.com/frappe/erpnext/issues/40010)) ([#40029](https://github.com/frappe/erpnext/issues/40029)) ([a543bf4](a543bf47ef))
* translatable columns in Sales Pipeline Analytics report ([1c5a7e2](1c5a7e29f2))
* type error for missing frm obj ([6b5e1cf](6b5e1cfeb7))
* unique gl account for plaid bank accounts ([65853da](65853da505))
* use correct variable name on hotfix branches ([0694fd1](0694fd19fd))
* use frm instead of cur_frm ([341f903](341f9030f5))
* use serial batch fields for packed items (backport [#40140](https://github.com/frappe/erpnext/issues/40140)) ([#40142](https://github.com/frappe/erpnext/issues/40142)) ([1860399](1860399ccb))

### Features

* show contributed qty in transaction summary ([38abfdb](38abfdb8ae))
* update billed amount in PO and PR ([e7e8149](e7e8149fbe))

### Performance Improvements

* new column Posting Datetime in SLE to optimize stock ledger related queries (backport [#39800](https://github.com/frappe/erpnext/issues/39800)) ([#40004](https://github.com/frappe/erpnext/issues/40004)) ([b9181e8](b9181e85dc))
 2024-02-28 05:13:40 +00:00
Deepesh Garg
4291b9fa8d
Merge pull request #40148 from frappe/version-15-hotfix 
chore: release v15
 2024-02-28 10:42:31 +05:30
Deepesh Garg
930df21a5f
Merge pull request #40170 from frappe/mergify/bp/version-15-hotfix/pr-40137 
fix: default taxable value for item not found in item list (#40137)
 2024-02-28 08:24:15 +05:30
mergify[bot]
6a63a6c98a
fix: Supplier users not able to see RFQ on the Portal (backport #40161) (#40165) 
* fix: Supplier users not able to see RFQ on the Portal (#40161)

(cherry picked from commit f8ba560394)

* chore: fix travis

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-27 22:30:26 +05:30
ljain112
7e43f6b7e0 fix: default taxable value for item not found in item list 
(cherry picked from commit 5885978fc2)
 2024-02-27 16:40:19 +00:00
Deepesh Garg
84a359c760
Merge pull request #40163 from vorasmit/ic-deps-v15 
fix: add flags for repost to ensure correct accounting from India Compliance App (#40162)
 2024-02-27 22:08:45 +05:30
Smit Vora
7d14ecfcb8 fix: add flags for repost to ensure correct accounting from India Compliance App 2024-02-27 20:30:28 +05:30
Gursheen Kaur Anand
07fd93a6f6
Merge pull request #40152 from frappe/mergify/bp/version-15-hotfix/pr-40095 
fix: unique GL account for plaid bank accounts (backport #40095)
 2024-02-27 17:08:37 +05:30
mergify[bot]
4784117a8f
fix: parent warehouse checks in the production plan for sub-assemblies (backport #40150) (#40157) 
fix: parent warehouse checks in the production plan for sub-assemblies (#40150)

(cherry picked from commit 6f5815e44f)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-27 17:03:21 +05:30
Gursheen Kaur Anand
7a9beb4d47
Merge pull request #40154 from frappe/mergify/bp/version-15-hotfix/pr-40102 
feat: toggle updation of billed amount in previous purchase docs (backport #40102)
 2024-02-27 16:40:14 +05:30
Gursheen Kaur Anand
87f36ce425
chore: fix typo 2024-02-27 16:24:14 +05:30
Gursheen Kaur Anand
48992cd205
chore: resolve conflicts 2024-02-27 16:18:27 +05:30
Gursheen Kaur Anand
99d1f1d67b
chore: resolve conflicts 2024-02-27 16:15:49 +05:30
Gursheen Kaur Anand
eadea0207c
chore: resolve conflicts 2024-02-27 16:13:49 +05:30
Gursheen Anand
e67d579ac4 test: pr billed amount against debit note 
(cherry picked from commit 6d40844894)
 2024-02-27 10:24:01 +00:00
Gursheen Anand
bac2f66344 test: po billed amount against debit note 
(cherry picked from commit 81dbfe189e)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/test_purchase_order.py
 2024-02-27 10:24:01 +00:00
Gursheen Anand
e7e8149fbe feat: update billed amount in PO and PR 
(cherry picked from commit 9f6535472d)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 2024-02-27 10:24:00 +00:00
Gursheen Anand
36b442a951 fix: remove config for default bank account in test 
(cherry picked from commit c42444ab3b)
 2024-02-27 10:10:20 +00:00
Gursheen Anand
65853da505 fix: unique gl account for plaid bank accounts 
(cherry picked from commit bf6e32a960)
 2024-02-27 10:10:20 +00:00
Gursheen Kaur Anand
df7afc3154
Merge pull request #40145 from frappe/mergify/bp/version-15-hotfix/pr-40143 
fix(minor): type error for missing form object in hide_company util (backport #40143)
 2024-02-27 13:33:13 +05:30
Gursheen Anand
341f9030f5 fix: use frm instead of cur_frm 
(cherry picked from commit ceeb8fc9e5)
 2024-02-27 07:45:36 +00:00
Gursheen Anand
6b5e1cfeb7 fix: type error for missing frm obj 
(cherry picked from commit 20fa3da950)
 2024-02-27 07:45:36 +00:00
ruthra kumar
9f8a27833a
Merge pull request #40135 from frappe/mergify/bp/version-15-hotfix/pr-40133 
fix: reset advance amount on unreconciliation of Sales/Purchase Orders (backport #40133)
 2024-02-27 10:33:07 +05:30
mergify[bot]
1860399ccb
fix: use serial batch fields for packed items (backport #40140) (#40142) 
fix: use serial batch fields for packed items (#40140)

(cherry picked from commit bc9c480246)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-27 07:57:37 +05:30
mergify[bot]
57bb031602
fix: currency symbol in landed cost voucher and material request (backport #40138) (#40141) 
fix: currency symbol in landed cost voucher and material request (#40138)

(cherry picked from commit 8aa2b7c183)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-26 23:16:49 +05:30
mergify[bot]
9d19ec43c8
fix: Data too long for column 'serial_no' at row 1 (backport #40098) (#40139) 
* fix: Data too long for column 'serial_no' at row 1 (#40098)

(cherry picked from commit 08caa7cfa1)

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

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-26 23:00:01 +05:30
ruthra kumar
0694fd19fd fix: use correct variable name on hotfix branches 2024-02-26 20:35:22 +05:30
ruthra kumar
94bb6241ef test: advance paid update on sales/purchase order unreconciliation 
(cherry picked from commit 1f01ff3487)
 2024-02-26 12:22:55 +00:00
ruthra kumar
4d1f56c4bd fix: on unreconciliation, update advance paid 
(cherry picked from commit c9e2f03a3a)
 2024-02-26 12:22:55 +00:00
ruthra kumar
ad53633c66
Merge pull request #40118 from frappe/mergify/bp/version-15-hotfix/pr-40113 
refactor: patch to setup dimensions in Reconciliation tool (backport #40113)
 2024-02-26 14:21:40 +05:30
ruthra kumar
2bf6125b71 refactor: patch to setup dimensions in Reconciliation tool 
(cherry picked from commit 461fb183fc)
 2024-02-26 13:08:47 +05:30
Frappe PR Bot
792de1be03 chore(release): Bumped to Version 15.14.7 
## [15.14.7](https://github.com/frappe/erpnext/compare/v15.14.6...v15.14.7) (2024-02-26)

### Bug Fixes

* Issues regarding asset cancellation and deletion ([6fc4dac](6fc4dac4db))
* removed unwanted patch ([3c98368](3c98368e45))
* resolved conflict ([fc565ec](fc565ecd99))
* resolved conflict ([d196aa5](d196aa5a36))
 2024-02-26 07:33:28 +00:00
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