Commit Graph

48485 Commits

Author SHA1 Message Date
ruthra kumar
57ec0d6b41 refactor: some logic
(cherry picked from commit 4c8a8c3bcd)
2024-03-22 08:51:27 +00:00
ruthra kumar
5ad3918232 feat: bisect doctype
(cherry picked from commit decdbd2782)
2024-03-22 08:51:27 +00:00
ruthra kumar
9e15ecfe34 refactor: primitive summary for p&l and balance sheet
(cherry picked from commit eb4c476490)
2024-03-22 08:51:27 +00:00
ruthra kumar
da17496e3d Merge pull request #40607 from frappe/mergify/bp/version-14-hotfix/pr-40520
fix: permissions during bulk transaction logs (backport #40520)
2024-03-22 10:33:49 +05:30
David
99faafb5be fix: permissions during bulk transaction logs
(cherry picked from commit 49dd4c1ef3)
2024-03-22 04:38:17 +00:00
ruthra kumar
6d39a7890e Merge pull request #40596 from frappe/mergify/bp/version-14-hotfix/pr-40386
fix: wrong buying amount if delivered and billed qty varies (backport #40386)
2024-03-22 09:04:26 +05:30
mergify[bot]
390d3a6a9f perf: add in some indexes (backport #40590) (#40604)
* perf: add in some indexes (#40590)

`Sales Invoice Item.purchase_order`
`Delivery Note Item.purchase_order`

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit 1cd38c860a)

# Conflicts:
#	erpnext/selling/doctype/sales_order_item/sales_order_item.json
#	erpnext/stock/doctype/delivery_note_item/delivery_note_item.json

* chore: `conflicts`

* chore: `conflicts`

---------

Co-authored-by: Akhil Narang <me@akhilnarang.dev>
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2024-03-22 08:51:33 +05:30
Frappe PR Bot
14f7aef4d0 chore(release): Bumped to Version 14.65.6
## [14.65.6](https://github.com/frappe/erpnext/compare/v14.65.5...v14.65.6) (2024-03-21)

### Bug Fixes

* rate not fetching from the item price ([18279a6](18279a6dbd))
v14.65.6
2024-03-21 17:33:34 +00:00
rohitwaghchaure
5f84e0d7e8 Merge pull request #40601 from frappe/mergify/bp/version-14/pr-40599
fix: rate not fetching from the item price (backport #40595) (backport #40599)
2024-03-21 23:02:23 +05:30
Rohit Waghchaure
18279a6dbd fix: rate not fetching from the item price
(cherry picked from commit d893a465d7)
(cherry picked from commit 9b3c4ac575)
2024-03-21 17:12:01 +00:00
rohitwaghchaure
5117ba5abf Merge pull request #40599 from frappe/mergify/bp/version-14-hotfix/pr-40595
fix: rate not fetching from the item price (backport #40595)
2024-03-21 22:40:58 +05:30
Rohit Waghchaure
9b3c4ac575 fix: rate not fetching from the item price
(cherry picked from commit d893a465d7)
2024-03-21 16:49:46 +00:00
ruthra kumar
d3a6153077 test: buying amt calculation if DN and SI differ in qty
(cherry picked from commit ccb51ded95)
2024-03-21 15:46:03 +00:00
Dany Robert
2b311131ba fix: wrong buying amount if delivered and billed qty varies
(cherry picked from commit b8da0d9334)
2024-03-21 15:46:02 +00:00
Gursheen Kaur Anand
c072cd941d Merge pull request #40583 from frappe/mergify/bp/version-14-hotfix/pr-40572
fix: PCV validation for previous fiscal year (backport #40572)
2024-03-21 12:44:09 +05:30
ruthra kumar
757cf8a76f Merge pull request #40581 from frappe/mergify/bp/version-14-hotfix/pr-40580
refactor: config changes in Transaction Deletion Record (backport #40580)
2024-03-21 11:07:17 +05:30
Gursheen Anand
82b613353b fix: validate gl for previous fiscal year
(cherry picked from commit a1d108c062)
2024-03-21 05:30:35 +00:00
ruthra kumar
5791c50fdf refactor: config changes in Transaction Deletion Record
(cherry picked from commit 4ba67fb3ec)
2024-03-21 05:17:16 +00:00
ruthra kumar
67481ad062 Merge pull request #40574 from frappe/mergify/bp/version-14-hotfix/pr-39717
refactor: Transaction Deletion record for large volumes (backport #39717)
2024-03-21 10:18:07 +05:30
ruthra kumar
1515bb7f0b refactor: replace get_job with create_job_id utility method 2024-03-21 09:53:55 +05:30
Frappe PR Bot
74ec853b97 chore(release): Bumped to Version 14.65.5
## [14.65.5](https://github.com/frappe/erpnext/compare/v14.65.4...v14.65.5) (2024-03-20)

### Bug Fixes

* style for tax breakup ([a0156e1](a0156e1e47))
* use Text Editor for rendering tax breakup table ([7df09d1](7df09d18e1))
v14.65.5
2024-03-20 15:22:12 +00:00
Deepesh Garg
7ed625d5e1 Merge pull request #40569 from frappe/mergify/bp/version-14/pr-40563
fix: use `Text Editor` for rendering tax breakup table (backport #40563)
2024-03-20 20:50:31 +05:30
Gursheen Kaur Anand
33e0371c4d Merge pull request #40571 from frappe/mergify/bp/version-14-hotfix/pr-40563
fix: use `Text Editor` for rendering tax breakup table (backport #40563)
2024-03-20 20:39:19 +05:30
Gursheen Anand
381899bf5f chore: resolve conflicts 2024-03-20 20:25:31 +05:30
Rohit Waghchaure
1df54114a8 chore: fixed test case 2024-03-20 20:20:44 +05:30
Gursheen Anand
cf3b0ee41e chore: resolve conflicts 2024-03-20 20:15:20 +05:30
Gursheen Anand
957f55f6b1 chore: resolve conflicts 2024-03-20 20:12:36 +05:30
Rohit Waghchaure
77349a0af6 chore: fix test case 2024-03-20 20:09:22 +05:30
Rohit Waghchaure
c36a5d1ba3 chore: fix backport issues 2024-03-20 20:09:22 +05:30
rohitwaghchaure
44d4096ba1 chore: fix conflicts 2024-03-20 20:09:22 +05:30
rohitwaghchaure
a694a92df9 chore: fix conflicts 2024-03-20 20:09:22 +05:30
rohitwaghchaure
1c7128e77b chore: fix conflicts 2024-03-20 20:09:22 +05:30
rohitwaghchaure
c147ec168f chore: fix conflicts 2024-03-20 20:09:22 +05:30
rohitwaghchaure
717442c01f chore: fix conflicts 2024-03-20 20:09:22 +05:30
Rohit Waghchaure
ce7a53f810 chore: remove microsecond from posting_datetime
(cherry picked from commit a73ba2c0d2)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
2024-03-20 20:08:37 +05:30
Rohit Waghchaure
1767dada8d test: test cases to test clash timestamp entries
(cherry picked from commit f04676aaed)
2024-03-20 20:08:36 +05:30
Rohit Waghchaure
5e68ebd030 perf: new column posting datetime in SLE to optimize stock ledger related queries
(cherry picked from commit d80ca523a4)
2024-03-20 20:07:36 +05:30
ruthra kumar
87fdb4e720 chore: resolve conflicts 2024-03-20 19:58:18 +05:30
ruthra kumar
e5722a772a chore: fix linting issue in JS
(cherry picked from commit 02c522b7cd)
2024-03-20 14:13:21 +00:00
ruthra kumar
35fcd032ad refactor(test): test cases modified to handle new approach
(cherry picked from commit 81309576b0)

# Conflicts:
#	erpnext/setup/demo.py
#	erpnext/setup/doctype/transaction_deletion_record/test_transaction_deletion_record.py
2024-03-20 14:13:21 +00:00
ruthra kumar
1fe14334f3 refactor: ability to process in single transaction
(cherry picked from commit a158b825d7)
2024-03-20 14:13:20 +00:00
ruthra kumar
b429f75d65 refactor: link running doc validation to company master
(cherry picked from commit 5a3afea8c7)

# Conflicts:
#	erpnext/setup/doctype/company/company.js
#	erpnext/setup/doctype/company/company.py
2024-03-20 14:13:20 +00:00
ruthra kumar
fab5c1170d chore: rename entry point
(cherry picked from commit 5fe0b20be1)
2024-03-20 14:13:19 +00:00
ruthra kumar
d496a1e58e chore: move status and error log to their own section
(cherry picked from commit 3cec62d4f8)
2024-03-20 14:13:19 +00:00
ruthra kumar
6ae9eb250f refactor: minor UI tweaks
(cherry picked from commit 0455d0c46c)
2024-03-20 14:13:19 +00:00
ruthra kumar
5e590389f3 refactor: exception propogation
(cherry picked from commit 4a55240e63)
2024-03-20 14:13:18 +00:00
ruthra kumar
1110dd93ff chore: code cleanup
(cherry picked from commit eea260b9f9)
2024-03-20 14:13:17 +00:00
ruthra kumar
0ea9ce7a5a refactor: better method naming
(cherry picked from commit 30463657bf)
2024-03-20 14:13:17 +00:00
ruthra kumar
cf6cb80d18 refactor: barebones hook on all doctypes with 'company' field
(cherry picked from commit ec194ef076)
2024-03-20 14:13:16 +00:00
ruthra kumar
e908003358 refactor: make sure only one task is running for doc
(cherry picked from commit 78c9cc63b1)
2024-03-20 14:13:16 +00:00