CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-13 23:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,631 Commits 415 Branches 1,717 Tags
92ed9fdd03f00633f71d856acedd4dc3ff284179
Commit Graph

43631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ruthra kumar
23a0a5337e fix: key error on p/l and balance sheet reports on foreign currency 
(cherry picked from commit a6794c3606)
 2022-12-06 16:55:03 +05:30
ruthra kumar
e18d0eca3c fix: replace sql code with fields list in get_cached_value 
(cherry picked from commit 19db7e2989)
 2022-12-06 16:55:00 +05:30
ruthra kumar
08bca7d252 fix: key error while filtering on date range and different currency 
(cherry picked from commit 9b8d6fe411)
 2022-12-06 10:14:01 +00:00
Deepesh Garg
ee74c555d5 Merge pull request #33230 from frappe/mergify/bp/version-14-hotfix/pr-33219 
fix: Allow item rate updates for non-stock invoices (backport #33219)
 2022-12-06 12:30:41 +05:30
Deepesh Garg
030765618b fix: Allow item rate udpates for non-stock invoices 
(cherry picked from commit ef9d126254)
 2022-12-06 03:43:16 +00:00
rohitwaghchaure
cea7a32abc Merge pull request #33225 from frappe/mergify/bp/version-14-hotfix/pr-33224 
fix: non empty FG batch picked while completing work order (backport #33224)
 2022-12-05 23:59:07 +05:30
Rohit Waghchaure
e5e6b5d81c fix: non empty FG batch picked while completing work order 
(cherry picked from commit 713330cbf6)
 2022-12-05 15:00:15 +00:00
ruthra kumar
60f5611fb9 Merge pull request #33223 from frappe/mergify/bp/version-14-hotfix/pr-33222 
fix: data import mandatory account_head, charge_type (backport #33222)
 2022-12-05 17:56:27 +05:30
ruthra kumar
653cb9fc3b fix: data import mandatory account_head, charge_type 
(cherry picked from commit 3814db02eb)
 2022-12-05 11:27:34 +00:00
Sagar Sharma
5bdec0b512 Merge pull request #33205 from frappe/mergify/bp/version-14-hotfix/pr-33199 
refactor: remove `balance` from `Warehouse Tree` (backport #33199)
 2022-12-02 18:27:07 +05:30
s-aga-r
bcbeaea05c refactor: remove balance from Warehouse Tree 
(cherry picked from commit 3ce8386ca3)
 2022-12-02 08:55:05 +00:00
Deepesh Garg
251440dfec Merge pull request #33203 from frappe/mergify/bp/version-14-hotfix/pr-33193 
fix: clear repost logs using Log Settings (backport #33193)
 2022-12-02 14:23:29 +05:30
Rohit Waghchaure
39680ed28b fix: test case 
(cherry picked from commit 2cce6f2a34)
 2022-12-02 08:26:50 +00:00
Rohit Waghchaure
e039a14f6f fix: default clear repost logs 
(cherry picked from commit 5949a7ecff)
 2022-12-02 08:26:49 +00:00
Deepesh Garg
a05bf0a7ca Merge pull request #33201 from frappe/mergify/bp/version-14-hotfix/pr-33195 
fix: type error on Sales Pipeline Analytics (backport #33195)
 2022-12-02 13:13:44 +05:30
ruthra kumar
3af2b9b423 fix: type error on Sales Pipeline Analytics 
(cherry picked from commit 4856e750f9)
 2022-12-02 04:41:21 +00:00
Deepesh Garg
d7306d2ec4 Merge pull request #33197 from frappe/mergify/bp/version-14-hotfix/pr-33183 
fix: Due date for month end payment term (backport #33183)
 2022-12-02 10:09:55 +05:30
Sagar Sharma
ffa4deac26 Merge pull request #33196 from frappe/mergify/bp/version-14-hotfix/pr-33182 
fix: Error on making stock entry from material request (backport #33182)
 2022-12-01 21:37:39 +05:30
Sagar Sharma
a80f8ed2f8 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-33182 2022-12-01 19:56:55 +05:30