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

46972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frappe PR Bot
33869a231c chore(release): Bumped to Version 15.3.0 
# [15.3.0](https://github.com/frappe/erpnext/compare/v15.2.0...v15.3.0) (2023-11-21)

### Bug Fixes

* attributes were mandatory for manufacturers ([00b9c23](00b9c2326c))
* issue occured when creating supplier with contact details ([aaccfeb](aaccfeb918))
* overallocation on Payment with PO/SO ([337707b](337707b9cc))
* pass check permission in render_address ([a420e13](a420e13765))
* payment entry rounding error ([384d6b5](384d6b516c))
* set asset's valuation_rate according to asset quantity (backport [#38254](https://github.com/frappe/erpnext/issues/38254)) ([#38256](https://github.com/frappe/erpnext/issues/38256)) ([c60aaa7](c60aaa799a))
* set default asset quantity as 1 [dev] (backport [#38223](https://github.com/frappe/erpnext/issues/38223)) ([#38226](https://github.com/frappe/erpnext/issues/38226)) ([99bf63e](99bf63ec0f))
* Suppier name was not taken when creating address from supplier ([2b94489](2b9448962f))
* Supplier Quotation fields ([#37963](https://github.com/frappe/erpnext/issues/37963)) ([aef955c](aef955c920))
* test case for rounded total with cash disc ([eab18e6](eab18e6f71))
* **Timesheet:** reset billing hours equal to hours if they exceed actual hours (backport [#38134](https://github.com/frappe/erpnext/issues/38134)) ([#38153](https://github.com/frappe/erpnext/issues/38153)) ([5b7b431](5b7b431dc9))
* **Timesheet:** warn user if billing hours > actual hours instead of resetting  (backport [#38239](https://github.com/frappe/erpnext/issues/38239)) ([#38241](https://github.com/frappe/erpnext/issues/38241)) ([1f2f5d8](1f2f5d8cf6))
* TypeError in Subcontracting Receipt (backport [#38200](https://github.com/frappe/erpnext/issues/38200)) ([#38208](https://github.com/frappe/erpnext/issues/38208)) ([3f57a7e](3f57a7e9f0))
* update modified timestamp ([a492e57](a492e574de))
* **ux:** `Task` creation from `Timesheet` (backport [#38207](https://github.com/frappe/erpnext/issues/38207)) ([#38211](https://github.com/frappe/erpnext/issues/38211)) ([e272041](e272041872))
* valuation rate for FG item for subcontracting receipt (backport [#38244](https://github.com/frappe/erpnext/issues/38244)) ([#38245](https://github.com/frappe/erpnext/issues/38245)) ([ed7b845](ed7b845a55))
* valuation rate in report Item Prices ([#38161](https://github.com/frappe/erpnext/issues/38161)) ([f71234e](f71234e3af))
* wrong round off and rounded total ([70eccf7](70eccf7da0))

### Features

* add `Supplier Delivery Note` field in SCR (backport [#38127](https://github.com/frappe/erpnext/issues/38127)) ([#38156](https://github.com/frappe/erpnext/issues/38156)) ([b89a4a7](b89a4a7218))
* Add accounting dimensions to Supplier Quotation ([7d4ac7e](7d4ac7e7ff))
 2023-11-21 18:57:56 +00:00
Deepesh Garg
de783da2b6
Merge pull request #38248 from frappe/version-15-hotfix 
chore: release v15
 2023-11-22 00:26:18 +05:30
mergify[bot]
c60aaa799a
fix: set asset's valuation_rate according to asset quantity (backport #38254) (#38256) 
fix: set asset's valuation_rate according to asset quantity (#38254)

(cherry picked from commit e2bb4e2baa9059afb27f685beb88172a615097a4)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-21 22:57:34 +05:30
ruthra kumar
07c0ed127a
Merge pull request #38236 from frappe/mergify/bp/version-15-hotfix/pr-38234 
test: prevent rounding loss based validation error (backport #38234)
 2023-11-21 15:00:40 +05:30
mergify[bot]
ed7b845a55
fix: valuation rate for FG item for subcontracting receipt (backport #38244) (#38245) 
fix: valuation rate for FG item for subcontracting receipt (#38244)

(cherry picked from commit 5c308a4f9aa1a27cbd216addbe495b9bf69735b1)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-21 14:53:03 +05:30
ruthra kumar
c84c97577f
Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-38234 2023-11-21 13:43:58 +05:30
mergify[bot]
1f2f5d8cf6
fix(Timesheet): warn user if billing hours > actual hours instead of resetting (backport #38239) (#38241) 
fix(Timesheet): warn user if billing hours > actual hours instead of resetting  (#38239)

* revert: "fix(Timesheet): reset billing hours equal to hours if they exceed actual hours"

This reverts commit 0ec8034507996f06eaf8ca13a414d10b34038c6c.

* fix: warn user if billing hours > actual hours

(cherry picked from commit ac91030b31f1108b7e32844f12a3a6c916c0120f)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2023-11-21 13:41:50 +05:30
ruthra kumar
bb77546849
Merge pull request #38237 from frappe/mergify/bp/version-15-hotfix/pr-37586 
fix: overallocation on purchase order to multiple invoices (backport #37586)
 2023-11-21 13:26:39 +05:30
ruthra kumar
2bec89a5bf chore: fix flakiness test_sales_order_partial_advance_payment 
(cherry picked from commit 4dff2c7a0dad1de840a2b1f53d51e9fe1682fa7f)
 2023-11-21 07:03:07 +00:00
ruthra kumar
034375b4f5 refactor(test): make use of utility methods 
(cherry picked from commit 547993f80103fa192563a82447c39fe122918767)
 2023-11-21 07:03:06 +00:00
ruthra kumar
9600a2cdb7 test: overalloction on reconciliation when PO is involved 
(cherry picked from commit 946228d783cb58cd2809f4b0bc0a854c49cc4060)
 2023-11-21 07:03:06 +00:00
ruthra kumar
337707b9cc fix: overallocation on Payment with PO/SO 
(cherry picked from commit 23df4205f8abfca6764d84665cb9877703c1a470)
 2023-11-21 07:03:05 +00:00
ruthra kumar
15f40a7af6 test: prevent rounding loss based validation error 
(cherry picked from commit 56e991b7f49e4677605f74b1de7d00ab40bf09cc)
 2023-11-21 12:16:36 +05:30
mergify[bot]
99bf63ec0f
fix: set default asset quantity as 1 [dev] (backport #38223) (#38226) 
fix: set default asset quantity as 1 [dev] (#38223)

* fix: make default asset quantity as 1

* fix: get rate_of_depreciation from asset category for asset auto-creation

* chore: create asset depr schedules on PR submit, not asset submit

* fix: set default asset quantity as 1

* chore: move patch from v15 to v14

(cherry picked from commit 9903049c7ac7310ca9e3f69c30dc355c2e13bfd5)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-20 22:49:38 +05:30
ruthra kumar
491e9b4fd5
Merge pull request #38214 from frappe/mergify/bp/version-15-hotfix/pr-38210 
refactor: extend billed amount update flag to POS Invoice as well (backport #38210)
 2023-11-20 15:02:24 +05:30
ruthra kumar
f88ec533e6
Merge pull request #38216 from frappe/mergify/bp/version-15-hotfix/pr-38212 
refactor: update scheduled job for bulk transaction (backport #38212)
 2023-11-20 14:49:33 +05:30
ruthra kumar
afaf6afd27 refactor: update scheduled job for bulk transaction 
(cherry picked from commit fb06ad7330fd31bf1def7b87a6c3b787650f1555)
 2023-11-20 08:51:31 +00:00
ruthra kumar
1ed65524e5 refactor: add flag to POS Invoice 
(cherry picked from commit 83a13e22b7f4aa8ba2c406389af4e7fa8aad55d0)
 2023-11-20 08:36:51 +00:00
ruthra kumar
5da9a22e4c refactor: set default for 'update_billed_amount_in_delivery_note' 
(cherry picked from commit ee0c64215d160f0bd493bcefc9e94a5a90d318d2)
 2023-11-20 08:36:50 +00:00
mergify[bot]
e272041872
fix(ux): Task creation from Timesheet (backport #38207) (#38211) 
* fix(ux): enable `Quick Entry` for `Task`

(cherry picked from commit 331ad62f3c27a54e9d6bb49f1b70b169b633b3a6)

* fix: add route options for new `Task`

(cherry picked from commit 2f3fc12c08218ca06fbb911781090e619a88cf22)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-20 12:44:26 +05:30
mergify[bot]
3f57a7e9f0
fix: TypeError in Subcontracting Receipt (backport #38200) (#38208) 
fix: TypeError in Subcontracting Receipt

(cherry picked from commit f6e93f084aadf82f444edb112cc9832b53294b15)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-20 12:40:41 +05:30
ruthra kumar
2186e1cce4
Merge pull request #38197 from frappe/mergify/bp/version-15-hotfix/pr-38159 
refactor: provision to truncate `remarks` in General Ledger and Accounts Receivable/Payable reports (backport #38159)
 2023-11-20 12:31:44 +05:30
Sagar Vora
7622a2791e
Merge pull request #38199 from frappe/mergify/bp/version-15-hotfix/pr-37963 
fix: Supplier Quotation fields (backport #37963)
 2023-11-20 11:47:01 +05:30
Sagar Vora
88b62a0a61 chore: resolve conflicts 2023-11-20 11:42:57 +05:30
Vishakh Desai
aef955c920 fix: Supplier Quotation fields (#37963) 
(cherry picked from commit c2bda2c70535ad9e8a61e752bbb551f387460125)

# Conflicts:
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
 2023-11-20 04:42:48 +00:00
ruthra kumar
c2cb86b40a refactor: add substring logic in ar/ap report 
(cherry picked from commit a9bf906545dc7c89613c7f6211c35e62b8d7b989)
 2023-11-20 04:38:26 +00:00
ruthra kumar
9ee8a78083 refactor: provision to set remarks length in accounts settings 
(cherry picked from commit 97090ff3679104d77a031f29d4acafb8b7ac1580)
 2023-11-20 04:38:26 +00:00
Deepesh Garg
0f227aa883
Merge pull request #38191 from frappe/mergify/bp/version-15-hotfix/pr-38171 
fix: wrong round off and rounded total (#38171)
 2023-11-19 19:44:23 +05:30
Deepesh Garg
fc1ee1b3ed
Merge pull request #38174 from frappe/mergify/bp/version-15-hotfix/pr-38147 
fix: issue occured when creating supplier with contact details (#38147)
 2023-11-19 19:21:36 +05:30
Deepesh Garg
cf7d0ab8a5
Merge pull request #38176 from frappe/mergify/bp/version-15-hotfix/pr-38163 
fix: attributes were mandatory for manufacturers (#38163)
 2023-11-19 19:20:56 +05:30
Deepesh Garg
c29bc8c97f
chore: linting issues 2023-11-19 19:20:06 +05:30
Dany Robert
eab18e6f71 fix: test case for rounded total with cash disc 
(cherry picked from commit cc60c328fe349f7d53c77799e8e91973c2790746)
 2023-11-19 13:49:19 +00:00
Dany Robert
70eccf7da0 fix: wrong round off and rounded total 
(cherry picked from commit 3a487bd33af1972d9ee8b7bb2f6277775c8e018e)
 2023-11-19 13:49:19 +00:00
Deepesh Garg
d0ae566e38
Merge pull request #38189 from frappe/mergify/bp/version-15-hotfix/pr-38177 
fix: payment entry rounding error (#38177)
 2023-11-19 19:10:59 +05:30
Devin Slauenwhite
384d6b516c fix: payment entry rounding error 
(cherry picked from commit 3d1e3a9cded735c420cb6c0ceb17c62034983076)
 2023-11-19 13:17:51 +00:00
Deepesh Garg
13d965276f
Merge pull request #38180 from frappe/mergify/bp/version-15-hotfix/pr-38161 
fix: valuation rate in report Item Prices (#38161)
 2023-11-19 18:44:50 +05:30
Deepesh Garg
7be7c6a479
Merge pull request #38173 from frappe/mergify/bp/version-15-hotfix/pr-38142 
feat: Add accounting dimensions to Supplier Quotation (#38142)
 2023-11-19 17:08:04 +05:30
Patrick Eissler
f71234e3af fix: valuation rate in report Item Prices (#38161) 
Co-authored-by: PatrickDenis-stack <77415730+PatrickDenis-stack@users.noreply.github.com>
(cherry picked from commit 32f622ef8061f7db50b4c8f63134f947afdcb306)
 2023-11-18 14:55:16 +00:00
barredterra
a492e574de fix: update modified timestamp 
Was missing in 434c2a1815f27c59de5cd94528bc371593bdd402
 2023-11-18 15:44:59 +01:00
PatrickDenis-stack
00b9c2326c fix: attributes were mandatory for manufacturers 
(cherry picked from commit 434c2a1815f27c59de5cd94528bc371593bdd402)
 2023-11-18 14:39:01 +00:00
Deepesh Garg
3172448c31 chore: Resolve conflicts 2023-11-18 19:58:10 +05:30
Kunhi
2b9448962f fix: Suppier name was not taken when creating address from supplier 
(cherry picked from commit 545ef3c23491e895bf288ddf7666ea80251b41e7)
 2023-11-18 14:18:32 +00:00
kunhi
aaccfeb918 fix: issue occured when creating supplier with contact details 
(cherry picked from commit 7842c9fba8b521b9ba7f65281c4f2384f62b06e1)
 2023-11-18 14:18:31 +00:00
Deepesh Garg
7d4ac7e7ff feat: Add accounting dimensions to Supplier Quotation 
(cherry picked from commit 089da459f73791b86d33cf066e6879e77af200b5)

# Conflicts:
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
 2023-11-18 14:11:38 +00:00
Sagar Vora
d89a9a5bfd
Merge pull request #38169 from frappe/mergify/bp/version-15-hotfix/pr-38167 
fix: pass check permission in `render_address` (backport #38167)
 2023-11-18 17:39:49 +05:30
Vishakh Desai
a420e13765 fix: pass check permission in render_address 
(cherry picked from commit 45299fe4b3e23774920d7c35f7fb66e786cf5aa5)
 2023-11-18 12:08:58 +00:00
mergify[bot]
b89a4a7218
feat: add Supplier Delivery Note field in SCR (backport #38127) (#38156) 
feat: add `Supplier Delivery Note` field in SCR

(cherry picked from commit da80e4dbce07707d57e3739b7bb2138adf199905)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-17 22:07:53 +05:30
mergify[bot]
5b7b431dc9
fix(Timesheet): reset billing hours equal to hours if they exceed actual hours (backport #38134) (#38153) 
fix(Timesheet): reset billing hours equal to hours if they exceed actual hours (#38134)

(cherry picked from commit 20c6e9fca29d80016cefb83deee4e44ac9bc1d47)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2023-11-17 18:25:37 +05:30
Frappe PR Bot
5336cf08fa chore(release): Bumped to Version 15.2.0 
# [15.2.0](https://github.com/frappe/erpnext/compare/v15.1.0...v15.2.0) (2023-11-17)

### Bug Fixes

* add revaluation journal filter in Payable report ([c967468](c9674683d1))
* allow regional gl in payment entry for gl preview ([#38136](https://github.com/frappe/erpnext/issues/38136)) ([20e15eb](20e15ebd22))
* bom creator not able to amend / duplicate  (backport [#38128](https://github.com/frappe/erpnext/issues/38128)) ([#38129](https://github.com/frappe/erpnext/issues/38129)) ([ed9cd7c](ed9cd7c92b))
* **dn:** regression from bulk transaction fix ([ea43862](ea43862fcd))
* GL Entries for receiving non CWIP assets using Purchase Receipt ([#38123](https://github.com/frappe/erpnext/issues/38123)) ([d512371](d51237195a))
* handle partial return against invoices ([ac61abb](ac61abb2e4))
* remove ESS role when not mapped to employee (backport [#37867](https://github.com/frappe/erpnext/issues/37867)) ([#38133](https://github.com/frappe/erpnext/issues/38133)) ([8276614](8276614c14))
* reset dr_or_cr for every reference ([22b39ac](22b39ac4b4))
* test total unallocated amount in payment ([cb4bb5b](cb4bb5b4ee))
* valuation rate for the subcontracting receipt supplied items with Serial and Batch Bundle (backport [#38094](https://github.com/frappe/erpnext/issues/38094)) ([#38097](https://github.com/frappe/erpnext/issues/38097)) ([28e6e5d](28e6e5d910))

### Features

* virtual parent doctype ([e68d2e1](e68d2e138a))
 2023-11-17 07:43:26 +00:00
Deepesh Garg
cb725dcf9f
Merge pull request #38145 from frappe/version-15-hotfix 
chore: v15 Release
 2023-11-17 13:12:09 +05:30