nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-29 03:28:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,688 Commits 448 Branches 1,744 Tags
745bef8ebc19c14c31f34cbcd0d4dc59e4aef3c9
Commit Graph

41688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Deepesh Garg
acf8b464f3 fix: Conversion factor error for invoices without item code (petty expenses) (#32714) 
* fix: Set default uom conversion factor to 1 for invoices

* chore: set default conversion_factor as 1

* chore: remove print statements

(cherry picked from commit 617518389a)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
 2022-12-29 05:12:48 +00:00
ruthra kumar
37ae2dfe7f fix: reconciled credit notes being fetched again in Payment Reconciliation tool (#33471) 
fix: reconciled cr note showing up as Payments
(cherry picked from commit 5ec11bad4f)
 2022-12-29 05:01:57 +00:00
ruthra kumar
5ec11bad4f fix: reconciled credit notes being fetched again in Payment Reconciliation tool (#33471) 
fix: reconciled cr note showing up as Payments
 2022-12-29 10:31:06 +05:30
ruthra kumar
6e363a62db fix: use base_net_amount in case of missing stock qty (#33457) 
(cherry picked from commit e3a0ce5d63)
 2022-12-29 04:05:54 +00:00
Deepesh Garg
334219e36a fix: Tax withheld vouchers naming rule (#33467) 2022-12-28 18:05:24 +05:30
Frappe PR Bot
cbda28d739 chore: release v13 (#33453) 
* fix: typerror on multi warehouse in Packed Items

DN(with bundled item with varying warehouses)-> Sales Invoice.

(cherry picked from commit e684eb32d0)

* test: type error on bundled products with different warehouses

(cherry picked from commit 5918bb03f7)

* fix: No permission to read doctype

(cherry picked from commit c0da948a4e)

* fix: `shipping_address` in PO

(cherry picked from commit 7e1b6b3c2a)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json

* chore: conflicts

* chore: linter

* refactor: Customer and Supplier Ledger summary will have hidden fields for better handling of user permission (#33432)

* feat: provision to setup opening balances for earnings and deductions while creating SSA

* fix: use get_all instead of get_value as get_value api dont supports between condition

* fix: patch

* fix: provision to set tax_deducted_till_date after document is subnmmited

* fix: `shipping_address` for non-drop shipping item

(cherry picked from commit 67a7ccf3ce)

* chore: linter (#33455)

fix: linter

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Saurabh <saurabh6790@gmail.com>
 2022-12-27 17:49:51 +05:30
Saurabh
79643a5716 chore: linter (#33455) 
fix: linter
 2022-12-27 17:49:38 +05:30
Sagar Sharma
707eb9e8d5 Merge pull request #33446 from frappe/mergify/bp/version-13-hotfix/pr-33437 
fix: `shipping_address` in PO for non-drop ship item (backport #33437)
 2022-12-27 10:16:50 +05:30
s-aga-r
19feebbcb6 fix: shipping_address for non-drop shipping item 
(cherry picked from commit 67a7ccf3ce)
 2022-12-26 15:51:49 +00:00
Nabin Hait
0cf9702a21 Merge pull request #33412 from saurabh6790/provision-to-set-earnings-and-deductions-till-date 
feat: provision to setup opening balances for earnings and deductions while creating SSA
 2022-12-26 17:26:35 +05:30
Saurabh
64454e0d4e fix: provision to set tax_deducted_till_date after document is subnmmited 2022-12-26 12:48:37 +05:30
Saurabh
7b813d6045 fix: patch 2022-12-26 12:22:34 +05:30
Saurabh
bc04e05b46 fix: use get_all instead of get_value as get_value api dont supports between condition 2022-12-26 12:09:03 +05:30
Saurabh
c3b9059c1b feat: provision to setup opening balances for earnings and deductions while creating SSA 2022-12-26 12:09:03 +05:30
Sagar Sharma
7f1574478b Merge pull request #33436 from frappe/mergify/bp/version-13-hotfix/pr-33434 
fix(ux): `shipping_address` in PO (backport #33434)
 2022-12-26 11:19:01 +05:30
Sagar Sharma
b634e44fac Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-33434 2022-12-26 10:49:48 +05:30
mergify[bot]
3aa335d36a refactor: Customer and Supplier Ledger summary will have hidden fields for better handling of user permission (#33432) 2022-12-26 10:12:35 +05:30