CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-15 16:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,953 Commits 416 Branches 1,718 Tags
2bec89a5bf339e8cd1db189cc27b556842e2def0
Commit Graph

46953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
2bec89a5bf chore: fix flakiness test_sales_order_partial_advance_payment 
(cherry picked from commit 4dff2c7a0d)
 2023-11-21 07:03:07 +00:00
ruthra kumar
034375b4f5 refactor(test): make use of utility methods 
(cherry picked from commit 547993f801)
 2023-11-21 07:03:06 +00:00
ruthra kumar
9600a2cdb7 test: overalloction on reconciliation when PO is involved 
(cherry picked from commit 946228d783)
 2023-11-21 07:03:06 +00:00
ruthra kumar
337707b9cc fix: overallocation on Payment with PO/SO 
(cherry picked from commit 23df4205f8)
 2023-11-21 07:03:05 +00:00
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 9903049c7a)

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 fb06ad7330)
 2023-11-20 08:51:31 +00:00
ruthra kumar
1ed65524e5 refactor: add flag to POS Invoice 
(cherry picked from commit 83a13e22b7)
 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 ee0c64215d)
 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 331ad62f3c)

* fix: add route options for new `Task`

(cherry picked from commit 2f3fc12c08)

---------

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

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

# 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 a9bf906545)
 2023-11-20 04:38:26 +00:00
ruthra kumar
9ee8a78083 refactor: provision to set remarks length in accounts settings 
(cherry picked from commit 97090ff367)
 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 cc60c328fe)
 2023-11-19 13:49:19 +00:00
Dany Robert
70eccf7da0 fix: wrong round off and rounded total 
(cherry picked from commit 3a487bd33a)
 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 3d1e3a9cde)
 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 32f622ef80)
 2023-11-18 14:55:16 +00:00
barredterra
a492e574de fix: update modified timestamp 
Was missing in 434c2a1815
 2023-11-18 15:44:59 +01:00
PatrickDenis-stack
00b9c2326c fix: attributes were mandatory for manufacturers 
(cherry picked from commit 434c2a1815)
 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 545ef3c234)
 2023-11-18 14:18:32 +00:00
kunhi
aaccfeb918 fix: issue occured when creating supplier with contact details 
(cherry picked from commit 7842c9fba8)
 2023-11-18 14:18:31 +00:00
Deepesh Garg
7d4ac7e7ff feat: Add accounting dimensions to Supplier Quotation 
(cherry picked from commit 089da459f7)

# 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 45299fe4b3)
 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 da80e4dbce)

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 20c6e9fca2)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2023-11-17 18:25:37 +05:30
mergify[bot]
20e15ebd22 fix: allow regional gl in payment entry for gl preview (#38136) 
fix: allow regional gl in payment entry for gl preview (#38136)

(cherry picked from commit 7e43d7b131)

Co-authored-by: Smit Vora <smitvora203@gmail.com>
 2023-11-17 12:40:18 +05:30
ruthra kumar
a699f8b9de Merge pull request #38139 from frappe/mergify/bp/version-15-hotfix/pr-38119 
fix: add revaluation journal filter in Payable report (backport #38119)
 2023-11-17 10:04:23 +05:30
ruthra kumar
c9674683d1 fix: add revaluation journal filter in Payable report 
(cherry picked from commit 134201794a)
 2023-11-17 10:01:35 +05:30
mergify[bot]
8276614c14 fix: remove ESS role when not mapped to employee (backport #37867) (#38133) 
fix: remove ESS role when not mapped to employee (#37867)

* fix: remove ESS role when not mapped to employee

* fix: emp role removal on unlinking

* fix: test case for user employee role mapping

* fix: mapped employee and user on creation

(cherry picked from commit 56b8d1b927)

Co-authored-by: Dany Robert <danyrt@wahni.com>
 2023-11-16 20:27:35 +05:30
mergify[bot]
ed9cd7c92b fix: bom creator not able to amend / duplicate (backport #38128) (#38129) 
fix: bom creator not able to amend / duplicate  (#38128)

fix: bom creator not able to amend
(cherry picked from commit 2df767f596)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-16 18:53:08 +05:30
Deepesh Garg
d51237195a fix: GL Entries for receiving non CWIP assets using Purchase Receipt (#38123) 
* fix: GL Entries for receiving non CWIP assets using Purchase Receipt

* test: Update tests
 2023-11-16 13:38:10 +05:30
Deepesh Garg
32039d4de1 Merge pull request #38126 from frappe/mergify/bp/version-15-hotfix/pr-38090 
fix(dn): regression from bulk transaction fix (#38090)
 2023-11-16 13:00:44 +05:30
David Arnold
ea43862fcd fix(dn): regression from bulk transaction fix 
(cherry picked from commit 426c245032)
 2023-11-16 07:13:47 +00:00
Ankush Menat
d0a74419b3 ci: change release branch 2023-11-16 12:18:47 +05:30
Deepesh Garg
57dea69185 Merge pull request #38120 from frappe/mergify/bp/version-15-hotfix/pr-38071 
fix: handle partial return against invoices in payment entries (#38071)
 2023-11-16 10:53:56 +05:30
Gursheen Anand
cb4bb5b4ee fix: test total unallocated amount in payment 
(cherry picked from commit 2499675ad1)
 2023-11-16 05:07:00 +00:00