nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 00:55:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,605 Commits 400 Branches 1,700 Tags
66bf1071bb6de1ea07dff60e2352dfe6121ed9cc
Commit Graph

41605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
66bf1071bb fix: don't check other warehouse ledgers to calculate valuation rate 
(cherry picked from commit ef2bf3c223)
 2023-01-10 10:05:12 +00:00
Sagar Sharma
410e617834 Merge pull request #33587 from frappe/mergify/bp/version-13-hotfix/pr-33562 
fix: better handling of duplicate bundle items (backport #33562)
 2023-01-09 22:55:56 +05:30
ruthra kumar
0b952e8bba fix: better handling of duplicate bundle items 
(cherry picked from commit c717e87c9e)
 2023-01-09 16:54:55 +00:00
mergify[bot]
e9d85a3ee4 ci: bump node in release workflow (backport #33574) (#33576) 
ci: bump node in release workflow (#33574)

[skip ci]

(cherry picked from commit 1ad1fc4c7d)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-01-09 13:26:18 +05:30
Rucha Mahabal
c20d469f31 fix: remove hard-coded roles for populating leave balance reports (#249) (#33557) 2023-01-06 14:28:15 +05:30
Sagar Sharma
7d0a118eab Merge pull request #33546 from frappe/mergify/bp/version-13-hotfix/pr-33543 
chore: enable `No Copy` attribute for `route` in Item Group (backport #33543)
 2023-01-05 13:32:52 +05:30
s-aga-r
2394f64872 chore: enable No Copy attribute for route in Item Group 
(cherry picked from commit 348dc32514)
 2023-01-05 07:33:04 +00:00
Daizy Modi
a50ad1d292 fix: remove unnecessary permissions from Appointment and Appointment Booking Settings (#33468) 
* fix: remove unnecessary permissions from Appointment and Appointment Booking Settings

* fix: remove line

* fix: use more intuitive import

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2023-01-04 21:44:44 +05:30
Deepesh Garg
be48b4a028 chore: resolve conflicts 2023-01-04 08:24:20 +05:30
Deepesh Garg
b6ed0698b4 chore: resolve conflicts 2023-01-03 22:56:58 +05:30
Deepesh Garg
208d541373 Merge branch 'version-13' into version-13-hotfix 2023-01-03 22:22:12 +05:30
mergify[bot]
865f233add fix: Missing opening entry in general ledger (backport #33519) (#33527) 
fix: Missing opening entry in general ledger (#33519)

(cherry picked from commit c78399c618)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-01-03 22:13:44 +05:30
mergify[bot]
ea99ac9c29 fix: Deferred revenue date comparison (backport #33515) (#33517) 
fix: Deferred revenue date comparison (#33515)

(cherry picked from commit a3ab8f973a)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-01-03 18:41:40 +05:30
mergify[bot]
6516e8042b fix(ecommerce): remove query parameters from referrer (backport #33269) (#33513) 
fix(ecommerce): remove query parameters from referer

inclusion of query parameters results in logic failure

example:
- logic check if referrer is `all-products`
- `http://shop.example/all-products` -> `all-products`, valid outcome
- `http://shop.example/all-products?start=1` -> `all-products?start=1`,
  invalid outcome

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit b6bd408f19)

Co-authored-by: Sabu Siyad <hello@ssiyad.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-01-03 17:51:57 +05:30
Rucha Mahabal
3c83ec5613 Merge pull request #33510 from ruchamahabal/mark-attendance-period 2023-01-03 16:47:31 +05:30
Rucha Mahabal
e5a187e08c fix(test): monthly attendance sheet 2023-01-03 16:18:42 +05:30
Rucha Mahabal
8df11516be fix(test): holiday list dates in attendance test setup 2023-01-03 15:44:58 +05:30
Rucha Mahabal
03af48b50b chore(style): fix formatting 2023-01-03 14:36:36 +05:30
Samuel Danieli
a2bd8d22cb test: get_unmarked_days 2023-01-03 13:15:36 +05:30
Samuel Danieli
d2f86ead74 feat: explicit time period for mark attendance 2023-01-03 13:12:15 +05:30
Sagar Sharma
985c47fe3b Merge pull request #33501 from frappe/mergify/bp/version-13-hotfix/pr-33444 
fix: consider child nodes while getting bin details (backport #33444)
 2023-01-02 19:29:33 +05:30
s-aga-r
6c7815cd72 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-33444 2023-01-02 19:12:19 +05:30
Sagar Sharma
9b1384f79c Merge pull request #33499 from frappe/mergify/bp/version-13-hotfix/pr-33495 
fix(stock): missing ordered_qty in get_bin_details (backport #33495)
 2023-01-02 18:53:59 +05:30
s-aga-r
299e02ae46 chore: linter 2023-01-02 18:23:50 +05:30
s-aga-r
4fb2d2c000 chore: use frappe.qb instead of frappe.db.get_value 
(cherry picked from commit c3911a592a)
 2023-01-02 06:25:22 +00:00
s-aga-r
c9bf062f63 fix: consider child nodes while getting bin details 
(cherry picked from commit c716dcc01e)
 2023-01-02 06:25:22 +00:00
Devin Slauenwhite
196ba6759e test: get_item_details contains bin details 
(cherry picked from commit 239a5f8bf4)
 2023-01-02 05:45:43 +00:00
Devin Slauenwhite
66ba098462 fix: add missing 'ordered_qty' to get_bin_details 
(cherry picked from commit 8d62cdfd5f)
 2023-01-02 05:45:42 +00:00
mergify[bot]
4ba2f1ec96 fix: Multi-currency issues in Bank Reconciliation Tool (backport #33488) (#33493) 
fix: Multi-currency issues in Bank Recociliation Tool

(cherry picked from commit ad53ecf2b4)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-01-02 08:52:04 +05:30
Deepesh Garg
6ab91348fd Merge pull request #33478 from frappe/mergify/bp/version-13-hotfix/pr-32714 
fix: Conversion factor error for invoices without item code (petty expenses) (backport #32714)
 2022-12-31 13:06:11 +05:30
Deepesh Garg
3f9b8923a9 chore: resolve conflicts 2022-12-30 20:57:38 +05:30
Deepesh Garg
038fa4dbe2 chore: resolve conflicts 2022-12-30 20:56:50 +05:30
Frappe PR Bot
d97e673874 chore(release): Bumped to Version 13.42.7 
## [13.42.7](https://github.com/frappe/erpnext/compare/v13.42.6...v13.42.7) (2022-12-30)

### Bug Fixes

* debit note not pulled on reconciliation tool ([e01ff0d](e01ff0df40))
v13.42.7 		2022-12-30 15:21:51 +00:00
Deepesh Garg
b16bfa541d Merge pull request #33491 from frappe/mergify/bp/version-13/pr-33483 
fix: debit note not pulled on reconciliation tool (#33483)
 2022-12-30 20:49:48 +05:30
rohitwaghchaure
8156cb4db0 Merge pull request #33490 from frappe/mergify/bp/version-13-hotfix/pr-33487 
Revert "fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation" (backport #33487)
 2022-12-30 16:13:20 +05:30
Deepesh Garg
65688684a7 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-32714 2022-12-30 16:00:59 +05:30
ruthra kumar
e01ff0df40 fix: debit note not pulled on reconciliation tool 
(cherry picked from commit cf133b2f1c)
 2022-12-30 10:05:59 +00:00
rohitwaghchaure
f0475e9cc5 fix: linter 2022-12-30 15:32:38 +05:30
ruthra kumar
b2333d3b5f Merge pull request #33483 from ruthra-kumar/debit_note_not_pulled_in_reconciliation_tool 
fix: debit note not pulled on reconciliation tool
 2022-12-30 15:02:49 +05:30
rohitwaghchaure
8521e12753 fix: conflicts 2022-12-30 14:35:12 +05:30
rohitwaghchaure
1c7c591ee2 fix: conflicts 2022-12-30 14:30:35 +05:30
rohitwaghchaure
c18a451362 fix: conflicts 2022-12-30 14:28:18 +05:30
rohitwaghchaure
529fb411ab Revert "fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation" 
(cherry picked from commit 728dc1acf4)

# Conflicts:
#	erpnext/hooks.py
#	erpnext/stock/doctype/stock_entry/stock_entry.py
#	erpnext/stock/doctype/stock_entry/test_stock_entry.py
 2022-12-30 08:51:54 +00:00
ruthra kumar
4acaa3eecf Merge pull request #33475 from frappe/mergify/bp/version-13-hotfix/pr-33457 
fix: use base_net_amount in case of missing stock qty (backport #33457)
 2022-12-30 13:39:54 +05:30
ruthra kumar
cf133b2f1c fix: debit note not pulled on reconciliation tool 2022-12-29 18:02:16 +05:30
ruthra kumar
92c895aa1c Merge pull request #33460 from frappe/mergify/bp/version-13-hotfix/pr-33380 
fix: ERR journals should be reported in AR/AP (backport #33380)
 2022-12-29 11:27:05 +05:30
Frappe PR Bot
8d99763bea chore(release): Bumped to Version 13.42.6 
## [13.42.6](https://github.com/frappe/erpnext/compare/v13.42.5...v13.42.6) (2022-12-29)

### Bug Fixes

* reconciled credit notes being fetched again in Payment Reconciliation tool ([#33471](https://github.com/frappe/erpnext/issues/33471)) ([b4589d8](b4589d8b8f))
* reconciled credit notes being fetched again in Payment Reconciliation tool ([#33471](https://github.com/frappe/erpnext/issues/33471)) ([37ae2df](37ae2dfe7f))
v13.42.6 		2022-12-29 05:30:04 +00:00
Deepesh Garg
b4589d8b8f fix: reconciled credit notes being fetched again in Payment Reconciliation tool (#33471) 
fix: reconciled credit notes being fetched again in Payment Reconciliation tool (#33471)
 2022-12-29 10:58:09 +05:30
ruthra kumar
ec15965a6c test: err for party should be in AR/AP report 
(cherry picked from commit 2ed86760d7)
 2022-12-29 10:53:55 +05:30
ruthra kumar
c850635551 fix: ERR journals reported in AR/AP 
Exchange Rate Revaluation on Receivable/Payable will included in AR/AP report

(cherry picked from commit b09eade3e4)
 2022-12-29 10:53:07 +05:30