nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 09:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,999 Commits 399 Branches 1,700 Tags
07db36b23d239700dc4306459d3bd8a57d01d4ce
Commit Graph

38999 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
07db36b23d Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-29940 2022-03-08 14:02:00 +05:30
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
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
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
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
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
Ankush Menat
5be64c2b7f docs: explain make_sl_entries arguments 
(cherry picked from commit eb8495a401)
 2022-03-02 13:30:20 +05:30
Ankush Menat
5ebfb65b42 fix: ignore serial no during landed cost voucher 
(cherry picked from commit efc4b943f8)
 2022-03-02 13:30:20 +05:30
Ankush Menat
cdafed1092 test: fix flaky bin value test 
(cherry picked from commit 5d85b35f41)
 2022-03-02 12:35:26 +05:30
Deepesh Garg
ab69cb7b76 Merge pull request #30014 from frappe/mergify/bp/version-13-hotfix/pr-29978 
fix: Commission not applied while making Sales Order from Quotation (backport #29978)
 2022-03-01 18:19:10 +05:30
Deepesh Garg
69d3678d21 Merge pull request #30025 from deepeshgarg007/payment_entry_exchange_rate 
fix: Exchange rate not getting set in payment entry
 2022-03-01 18:18:42 +05:30
mergify[bot]
28a7c79f3c fix: dont validate empty category (#30038) 
(cherry picked from commit 65bb727030)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-01 17:57:10 +05:30
mergify[bot]
c7539ae416 fix(test): flaky test_point_of_sale (#30035) 
(cherry picked from commit 47fe87a72f)

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2022-03-01 17:51:40 +05:30
Saqib Ansari
3eee7412c5 Merge pull request #30033 from frappe/mergify/bp/version-13-hotfix/pr-30032 
fix: debit credit difference case with rounding adjustment (backport #30032)
 2022-03-01 15:33:10 +05:30
rohitwaghchaure
1e5b9e747f Merge pull request #30023 from frappe/mergify/bp/version-13-hotfix/pr-30015 
refactor: removed validation to check zero qty (backport #30015)
 2022-03-01 14:44:31 +05:30
Saqib Ansari
d93a41e0d0 fix: debit credit difference case with rounding adjustment 
(cherry picked from commit ad2c64f3ff)
 2022-03-01 08:43:25 +00:00
Deepesh Garg
40c0f79291 Merge pull request #30027 from frappe/mergify/bp/version-13-hotfix/pr-30026 
fix: Deferred revenue booking (backport #30026)
 2022-03-01 13:26:28 +05:30
Ankush Menat
5f4965022f fix: track changes on warehouse 
(cherry picked from commit d22a1d440c)
 2022-03-01 13:11:49 +05:30
Deepesh Garg
5f9b2cc1bf fix: Deferred revenue booking 
(cherry picked from commit 366120ffee)
 2022-03-01 07:12:02 +00:00
Deepesh Garg
86e6bdf2c9 fix: Exchange rate not getting set in payment entry 2022-02-28 21:07:08 +05:30
Deepesh Garg
fb05230d51 Merge pull request #30024 from frappe/mergify/bp/version-13-hotfix/pr-29977 
fix: Total taxes and charges in payment entry for multi-currency payments (backport #29977)
 2022-02-28 19:36:21 +05:30
Ankush Menat
e89d60147e test: remove transaction commits from buying module 
(cherry picked from commit 829c453cb6)
 2022-02-28 19:28:36 +05:30
Deepesh Garg
de978ca3d7 test: Add test case for payment entry taxes 
(cherry picked from commit 19fb7ead9f)
 2022-02-28 13:40:22 +00:00
Deepesh Garg
6ed01fedd4 fix: Total taxes and charges in payment entry for multicurrency payments 
(cherry picked from commit b1a46c80d5)
 2022-02-28 13:40:22 +00:00
Deepesh Garg
ca6f196bad fix: Remove conflicts 2022-02-28 18:15:29 +05:30
Rohit Waghchaure
b98d3da8e3 fix: removed validation to check zero qty 
(cherry picked from commit 39d3f20d9b)
 2022-02-28 12:25:20 +00:00
Ankush Menat
aa684e6f3d fix: dont fetch draft/cancelled BOMs 
(cherry picked from commit 1d1203d5ec)
 2022-02-28 15:15:36 +05:30
Deepesh Garg
ebf70a4b5d test: add correct test case 
(cherry picked from commit 4e9a9f35a6)
 2022-02-28 07:35:04 +00:00
Deepesh Garg
bce4ca9390 fix: Commission not applied while making Sales Order from Quotation 
(cherry picked from commit 0373914704)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
 2022-02-28 07:35:04 +00:00