CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-14 07:47:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,650 Commits 416 Branches 1,717 Tags
6c3e8026570e4630f6cfbe4aef13c82d43378efb
Commit Graph

43650 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sagar Sharma
6c3e802657 Merge pull request #33320 from frappe/mergify/bp/version-14-hotfix/pr-33314 
fix: `Enough Parts to Build` in `BOM Stock Report` (backport #33314)
 2022-12-13 15:58:24 +05:30
Sagar Sharma
4059b768f6 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-33314 2022-12-13 15:24:41 +05:30
Nabin Hait
bd6d249b8a Merge pull request #33322 from frappe/mergify/bp/version-14-hotfix/pr-33300 
fix(pos): variable typo: `s_pos` -> `is_pos` (backport #33300)
 2022-12-13 15:22:53 +05:30
Sabu Siyad
afbd48f26e fix(pos): variable typo: s_pos -> is_pos 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit 7d64bf78cf)
 2022-12-13 09:52:15 +00:00
s-aga-r
3b9e9d2c6e fix: Enough Parts to Build in BOM Stock Report 
(cherry picked from commit 723c64ba73)
 2022-12-13 09:50:01 +00:00
Nabin Hait
00ce3382b8 Merge pull request #33316 from frappe/mergify/bp/version-14-hotfix/pr-33313 
fix: Permission issue in Tax Detail report (backport #33313)
 2022-12-13 15:15:35 +05:30
Nabin Hait
00379c277b Merge pull request #33259 from AnandBaburajan/handle_post_depr_entries_fail 
fix: handle asset depreciation entries posting failure, show error alert and send email
 2022-12-13 15:05:36 +05:30
Nabin Hait
7a5b80dfbc fix: Permission issue in Tax Detail report 
(cherry picked from commit aa787e4030)
 2022-12-13 08:58:29 +00:00
Anand Baburajan
db36ddc7c0 Merge branch 'version-14-hotfix' into handle_post_depr_entries_fail 2022-12-13 14:09:11 +05:30
ruthra kumar
dbd0d560a8 Merge pull request #33311 from frappe/mergify/bp/version-14-hotfix/pr-33303 
fix: incorrect balance on parent company on consolidate Balance sheet due to key mismatch (backport #33303)
 2022-12-13 13:45:41 +05:30
rohitwaghchaure
d707528113 Merge pull request #33301 from frappe/mergify/bp/version-14-hotfix/pr-33281 
fix: maintain same rate throughout sales cycle doesn't work with quotation (backport #33281)
 2022-12-13 10:59:11 +05:30
ruthra kumar
436e93c129 fix: incorrect balance on parent company due to key mismatch 
(cherry picked from commit 7b3316dc31)
 2022-12-13 03:37:05 +00:00
Sagar Sharma
8b7c9ced0a Merge pull request #33306 from frappe/mergify/bp/version-14-hotfix/pr-33304 
fix: `Material Request` reference in internal `Sales Order` (backport #33304)
 2022-12-12 23:53:10 +05:30
s-aga-r
416d178209 fix: Material Request reference in internal Sales Order 
(cherry picked from commit 78b438f6cf)
 2022-12-12 18:18:53 +00:00
Tunde Akinyanmi
5d410f114a test: refactor test case 
(cherry picked from commit 71aa8c5e1c)
 2022-12-12 14:10:04 +00:00
Tunde Akinyanmi
1b94200ab7 test: ensure test case sets Selling Settings 
(cherry picked from commit d193a14b8f)
 2022-12-12 14:10:04 +00:00
Tunde Akinyanmi
5398cf8f22 fix: Maintain Same Rate Throughout Sales Cycle doesn't work 
Issue #29976 was partly fixed by #32923 but the problem still persists.
The reason is because an incorrect fieldname was passed to the
`validate_rate_with_reference_doc` method.
This commit fixes it

(cherry picked from commit 97ddfcfc7c)
 2022-12-12 14:10:03 +00:00
Anand Baburajan
7a7325fd90 Merge branch 'version-14-hotfix' into handle_post_depr_entries_fail 2022-12-12 16:36:19 +05:30
mergify[bot]
ce63086813 perf: add indexes on payment entry reference (backport #33288) (#33289) 
perf: add indexes on payment entry reference (#33288)

Adds index on:
1. reference doctype
2. reference name

*Why not composite index?*

There are three type of queries on this doctype

- filtering ref_doctype - doctype index helps here
- filtering ref_name - name index helps here
- filtering both - name index helps here too. Since it has sufficiently
  high cardinality. Composite index wont help in case where ref_doctype
  isn't specfied.

[skip ci]

(cherry picked from commit 593626f502)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-12-12 13:02:23 +05:30
Anand Baburajan
92ed9fdd03 Merge branch 'version-14-hotfix' into handle_post_depr_entries_fail 2022-12-08 21:26:27 +05:30
rohitwaghchaure
52e07da535 Merge pull request #33262 from frappe/mergify/bp/version-14-hotfix/pr-33258 
fix: total value in Warehouse Wise Stock Balance (backport #33258)
 2022-12-08 21:14:29 +05:30
Anand Baburajan
9b5620c838 Merge branch 'version-14-hotfix' into handle_post_depr_entries_fail 2022-12-08 21:04:32 +05:30
anandbaburajan
4fbf65dd57 chore: use frappe.db.set_value instead of asset.save 2022-12-08 21:04:08 +05:30
Deepesh Garg
c2aaab9e15 Merge pull request #33272 from frappe/mergify/bp/version-14-hotfix/pr-33200 
fix: Buying and selling check in pricing rule (backport #33200)
 2022-12-08 20:54:48 +05:30
Deepesh Garg
ad03355333 chore: Update tests 
(cherry picked from commit 6192af5cf0)
 2022-12-08 13:12:32 +00:00
Deepesh Garg
5e5937d6d0 fix: Remove free items 
(cherry picked from commit 0581000990)
 2022-12-08 13:12:31 +00:00
Deepesh Garg
033b2a4825 chore: Add POS Invoices 
(cherry picked from commit 5f821b93a5)
 2022-12-08 13:12:31 +00:00
Deepesh Garg
c726c16702 fix: Reapply pricing rule on qty change 
(cherry picked from commit b741ae143c)
 2022-12-08 13:12:30 +00:00
Deepesh Garg
f5205a5b5d fix: Buying and selling check in pricing rule 
(cherry picked from commit f54838ab56)
 2022-12-08 13:12:30 +00:00
Deepesh Garg
b0cccaff01 Merge pull request #33266 from frappe/mergify/bp/version-14-hotfix/pr-33227 
fix: add translation variable index (backport #33227)
 2022-12-08 18:06:37 +05:30
Deepesh Garg
05056327e7 Merge pull request #33270 from frappe/mergify/bp/version-14-hotfix/pr-33269 
fix(ecommerce): remove query parameters from referrer (backport #33269)
 2022-12-08 18:06:22 +05:30
Sabu Siyad
40621b99c8 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)
 2022-12-08 11:42:24 +00:00
barredterra
ef933a8231 fix: add translation variable order 
(cherry picked from commit 748c74ba52)
 2022-12-08 09:47:56 +00:00
Deepesh Garg
8467b2eb25 Merge pull request #33264 from frappe/mergify/bp/version-14-hotfix/pr-33254 
fix: index error on customer master (backport #33254)
 2022-12-08 15:15:42 +05:30
ruthra kumar
02cc618a1f fix: index error on customer master 
(cherry picked from commit cf1e3dc8ea)
 2022-12-08 07:23:13 +00:00
Rohit Waghchaure
c5a54d7912 fix: total value in Warehouse Wise Stock Balance 
(cherry picked from commit f598da7c81)
 2022-12-08 04:43:59 +00:00
anandbaburajan
bb66b64b94 chore: styling 2022-12-08 01:35:10 +05:30
Anand Baburajan
c35e352b3b Merge branch 'version-14-hotfix' into handle_post_depr_entries_fail 2022-12-08 01:29:43 +05:30
anandbaburajan
b661f5758a fix: handle_post_depr_entries_fail, show error alert and send email 2022-12-08 01:00:57 +05:30
Sagar Sharma
162ecdca75 Merge pull request #33256 from frappe/mergify/bp/version-14-hotfix/pr-33255 
fix: order status in `Production Planning Report` (backport #33255)
 2022-12-08 00:04:01 +05:30
s-aga-r
a657db66b4 fix: order status in Production Planning Report 
(cherry picked from commit 632c08f7e0)
 2022-12-07 18:06:54 +00:00
Deepesh Garg
e5cd4195d9 Merge pull request #33238 from frappe/mergify/bp/version-14-hotfix/pr-33192 
fix: Bundle item rates (backport #33192)
 2022-12-06 18:57:08 +05:30
Deepesh Garg
8a17680e75 Merge pull request #33239 from frappe/mergify/bp/version-14-hotfix/pr-33146 
fix: reload Currency Exchange Settings in patch (backport #33146)
 2022-12-06 18:56:52 +05:30
rohitwaghchaure
bc5523318c Merge pull request #33240 from frappe/mergify/bp/version-14-hotfix/pr-33236 
feat: warehouse wise stock balance (backport #33236)
 2022-12-06 18:03:36 +05:30
Rohit Waghchaure
7027fdae39 feat: warehouse wise stock balance 
(cherry picked from commit 861aa9e08a)
 2022-12-06 12:29:23 +00:00
barredterra
5b5a85ee3b fix: reload currency exchange settings 
(cherry picked from commit 06e094b5fc)
 2022-12-06 12:09:03 +00:00
Deepesh Garg
98bb446e98 chore: Update tests 
(cherry picked from commit b1242bc56c)
 2022-12-06 12:08:06 +00:00
Deepesh Garg
076027a68c chore: Consider bundle qty as well 
(cherry picked from commit e5566b31d5)
 2022-12-06 12:08:06 +00:00
Deepesh Garg
82cdf49d32 fix: Bundle item rates 
(cherry picked from commit 826f45ad60)
 2022-12-06 12:08:05 +00:00
Deepesh Garg
cc0f9d4ed5 Merge pull request #33235 from frappe/mergify/bp/version-14-hotfix/pr-33191 
fix: key error while filtering on date range and reporting on foreign currency (backport #33191)
 2022-12-06 17:36:18 +05:30