nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-19 06:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,817 Commits 444 Branches 1,739 Tags
fd5d2ed87f079a270894de6821e406fdc3d78d65
Commit Graph

41817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
ac7f1820c5 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-29740 2022-03-08 21:41:53 +05:30
mergify[bot]
e5c82d018f fix: Get MRs that are yet to be received but fully ordered in Report Requested Items to Order and Receive (backport #29987) (#30083) 
* fix: Get MRs that are yet to be received but fully ordered in Report

- Remove incorrect query clause that only check if ordered qty < 100
- MR should be visible in report until fully received (cycle complete)

(cherry picked from commit d3b0ca30c6)

* refactor: Convert to QB, added test file, removed white space

- Converted mysql raw query to qb
- Test file for Report Requested Items to Order and Receive
- Removed white space and edited copyright year

(cherry picked from commit e6952cb7f9)

* fix: Sider and Linter

(cherry picked from commit ac425722e2)

* fix: linter (imports alphabetical)

(cherry picked from commit 54b3676f35)

Co-authored-by: marination <maricadsouza221197@gmail.com>
 2022-03-08 18:00:19 +05:30
Deepesh Garg
dc8fd6d0ff Merge pull request #30104 from frappe/mergify/bp/version-13-hotfix/pr-29940 
fix: Item discounts for quotation and other docs (backport #29940)
 2022-03-08 14:58:43 +05:30
Rohit Waghchaure
ab0dcd7146 Merge branch 'version-13-pre-release' into version-13 v13.22.0 2022-03-08 14:57:18 +05:30
Rohit Waghchaure
a7776f85ef bumped to version 13.22.0 2022-03-08 15:17:18 +05:50
Deepesh Garg
7de6f0a9c3 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-29865 2022-03-08 14:02:26 +05:30
Deepesh Garg
07db36b23d Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-29940 2022-03-08 14:02:00 +05:30
Deepesh Garg
c46e76c543 Merge pull request #30109 from deepeshgarg007/change_log_v13_22 
chore: change log for v13.22.0
 2022-03-08 13:06:29 +05:30
Deepesh Garg
9538c94b69 chore: change log for v13.22.0 2022-03-08 12:48:27 +05:30
Saqib Ansari
86afbf98a3 Merge pull request #30108 from frappe/mergify/bp/version-13-pre-release/pr-30097 
fix(pos): multiple pos round off cases (backport #30097)
 2022-03-08 12:40:16 +05:30
Saqib Ansari
150d1e6e60 fix(pos): multiple pos round off cases 
(cherry picked from commit 17445c7e04)
 2022-03-08 06:29:56 +00:00
Saqib Ansari
f7f114789d Merge pull request #30106 from frappe/mergify/bp/version-13-hotfix/pr-30097 
fix(pos): multiple pos round off cases (backport #30097)
 2022-03-08 11:59:02 +05:30
Saqib Ansari
31f20cf144 fix(pos): multiple pos round off cases 
(cherry picked from commit 17445c7e04)
 2022-03-08 05:55:08 +00:00
Deepesh Garg
ba4d496404 fix: Resolve conflicts 2022-03-08 09:55:36 +05:30
Türker Tunalı
456ebc32f0 fix: translate error message titles 2022-03-08 09:54:33 +05:30
Deepesh Garg
9af14ec0d0 fix: Test cases with discount 
(cherry picked from commit d95f8934aa)
 2022-03-08 03:39:33 +00:00
Ankush Menat
dfbd0ebf91 fix: apply margin on duplicated doc too 
(cherry picked from commit bbc4710fa3)
 2022-03-08 03:39:33 +00:00
Deepesh Garg
fd3adbb6fe fix: Item discounts for quotation 
(cherry picked from commit 3a547cb0d9)

# Conflicts:
#	erpnext/selling/doctype/quotation/quotation.js
 2022-03-08 03:39:33 +00:00
mergify[bot]
a8ae86e23f fix: wrong payment days in salary slip for employees joining/leaving during mid payroll dates (backport #29082) (#30099) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Dany Robert <danyrt@wahni.com>
 2022-03-07 20:29:52 +05:30
Deepesh Garg
2b512617fa Merge pull request #30098 from deepeshgarg007/pre_release 
chore: Merge branch version-13-hotfix into version-13-pre-release
 2022-03-07 19:12:42 +05:30
Deepesh Garg
7452b8572e Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into pre_release 2022-03-07 18:07:42 +05:30
Saqib Ansari
0ed7249484 Merge pull request #30089 from frappe/version-13-pre-release 
Merge 'version-13-pre-release' into 'version-13'
v13.21.1 		2022-03-07 12:16:25 +05:30
Saqib Ansari
25dce9da67 chore: bumped to version 13.21.1 2022-03-07 12:15:42 +05:30
Saqib Ansari
db26928b28 Merge pull request #30086 from frappe/mergify/bp/version-13-hotfix/pr-30084 
fix(e-invoicing): remove batch no from e-invoices (backport #30084)
 2022-03-07 11:56:58 +05:30
Saqib Ansari
5a5d9b42c0 Merge pull request #30087 from frappe/mergify/bp/version-13-pre-release/pr-30084 
fix(e-invoicing): remove batch no from e-invoices (backport #30084)
 2022-03-07 11:56:40 +05:30
Saqib Ansari
052ad1fb47 fix(e-invoicing): remove batch no from e-invoices 
(cherry picked from commit 031a0dd703)
 2022-03-07 06:25:00 +00:00
Saqib Ansari
cf2580083c fix(e-invoicing): remove batch no from e-invoices 
(cherry picked from commit 031a0dd703)
 2022-03-07 06:24:21 +00:00
Saqib Ansari
58501c7e0e Merge pull request #30085 from frappe/mergify/bp/version-13-pre-release/pr-29991 
fix(pos): minor fixes (backport #29991)
 2022-03-07 11:53:14 +05:30
Saqib Ansari
3525f0e585 fix: merge conflicts 2022-03-07 11:52:16 +05:30
Saqib Ansari
25c434fb02 fix(pos): coupon code is applied even if ignore pricing rule is check 
(cherry picked from commit 81514516f3)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
 2022-03-07 06:20:52 +00:00
Saqib Ansari
da4e43b8bc fix(pos): mode of payment disappears after save 
(cherry picked from commit 69c34cd7ae)
 2022-03-07 06:20:50 +00:00
Saqib Ansari
8af7a9918b Merge pull request #30079 from frappe/mergify/bp/version-13-hotfix/pr-29939 
feat: update ordered qty for packed items (backport #29939)
 2022-03-06 13:45:31 +05:30
Saqib Ansari
1e418f9ecc fix: merge conflicts 2022-03-06 13:13:50 +05:30
Saqib Ansari
447692d770 chore: remove unintentional search index 
(cherry picked from commit 2f1709dfef)
 2022-03-06 07:40:51 +00:00
Saqib Ansari
1c0d0e1ac7 chore: remove unintentional search index 
(cherry picked from commit 1e139cf9a1)
 2022-03-06 07:40:51 +00:00
Saqib Ansari
14f31ac2fa test: po updates packed item's ordered_qty 
(cherry picked from commit 8e3f1e306d)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
 2022-03-06 07:40:51 +00:00
Saqib Ansari
131158a24c feat: update ordered qty for packed items 
(cherry picked from commit 8005fee656)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.js
 2022-03-06 07:40:50 +00:00
Govind S Menokee
363752510e fix: HSN-wise-summary of outward supplies Updated Report 
Report changes done in order to meet the specification as per govt guideline - [GUIDELINE](https://taxguru.in/goods-and-service-tax/12-points-note-filing-gstr-1-01st-2021-onwards.html)
 2022-03-02 22:29:19 +05:30
Ankush Menat
a8137bda67 fix: dont hardcode precision in routing 
Co-Authored-By: Suraj Shetty <surajshetty3416@gmail.com>
(cherry picked from commit 9ef35ef773)
 2022-03-02 20:22:02 +05:30
Ankush Menat
d34f5051d7 fix: remove dead dashboard links 
(cherry picked from commit f8ac4c082a)
 2022-03-02 20:22:02 +05:30
Ankush Menat
5bad8d0e10 fix: dont hardcode precision in routing 
Co-Authored-By: Suraj Shetty <surajshetty3416@gmail.com>
(cherry picked from commit 9ef35ef773)
 2022-03-02 19:34:01 +05:30
Ankush Menat
478e1eb8db fix: remove dead dashboard links 
(cherry picked from commit f8ac4c082a)
 2022-03-02 19:34:01 +05:30
mergify[bot]
8ef1f679f7 chore: get stock reco qty from SR instead of SLE (#30059) (#30060) 
[skip ci]

(cherry picked from commit 55a966ec41)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-02 14:50:54 +05:30
mergify[bot]
d1cc291c80 fix(Timesheet): fetch exchange rate only if currency is set (backport #30057) (#30058) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-02 14:19:11 +05:30
Ankush Menat
95f30ada7b fix: resolve conflicts 2022-03-02 14:08:57 +05:30
Ankush Menat
870799c4e2 fix: repost items with repeating item-warehouses 
(cherry picked from commit 3638fbf06b)
 2022-03-02 14:08:57 +05:30
Ankush Menat
a1c3e9aef9 revert "fix: FIFO valuation in case of multi-item entries" 
This reverts commit b8ee193d1a.

This is huge performance regression for large docs.

(cherry picked from commit 701878f60b)
 2022-03-02 14:08:57 +05:30
Ankush Menat
9fc0da1688 test: repack FIFO rates 
(cherry picked from commit 2f71c5bcca)
 2022-03-02 14:08:57 +05:30
Ankush Menat
bb58c49aef fix: FIFO valuation in case of multi-item entries 
(cherry picked from commit ccd2ce56b1)
 2022-03-02 14:08:57 +05:30
Ankush Menat
a84e7c633e test: FIFO transfer for multi-batch transaction 
(cherry picked from commit b3b7cdfb49)

# Conflicts:
#	erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py
 2022-03-02 14:08:57 +05:30