nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-09 16:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,084 Commits 458 Branches 1,746 Tags
7c4f5fa5c5f798ebec5b8dbf33df746f380e2d2e
Commit Graph

41084 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
856534c8a0 fix: Remove tax invoice no field 
(cherry picked from commit 8a2fe7a2e3)
 2022-03-09 10:51:05 +00:00
Ankush Menat
76376d7ad7 chore: bump version v13.22.1 2022-03-09 15:41:58 +05:30
Deepesh Garg
5c7b2e2616 Merge pull request #30133 from frappe/mergify/bp/version-13-hotfix/pr-30096 
fix(ux): Improve label for better understanding (backport #30096)
 2022-03-09 15:40:26 +05:30
mergify[bot]
a12a3bd441 fix: dont fetch entire barcode table in get_item_details (#30131) (#30135) 
(cherry picked from commit 64905188c4)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-09 15:38:38 +05:30
mergify[bot]
58f41722b6 fix: dont fetch entire barcode table in get_item_details (#30131) (#30134) 
(cherry picked from commit 64905188c4)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-09 15:38:26 +05:30
Deepesh Garg
4a5ea55965 fix(ux): Improve label for better understanding 
(cherry picked from commit f3a95d3c27)
 2022-03-09 10:05:11 +00:00
Deepesh Garg
ab6cdbde14 Merge pull request #29949 from frappe/mergify/bp/version-13-hotfix/pr-29865 
feat: Bank Reconciliation for loan documents (backport #29865)
 2022-03-09 15:23:38 +05:30
Mohamed-D-Ouf
3d8eaa5392 fix: add filters in default_discount_account (#30095) 2022-03-09 11:25:36 +05:30
Ankush Menat
ba21e2e08d Merge pull request #30123 from frappe/mergify/bp/version-13-hotfix/pr-30080 
fix: Item-wise sales history report (backport #30080)
 2022-03-09 11:16:34 +05:30
Ankush Menat
b3fd6652c0 Merge pull request #30122 from frappe/mergify/bp/version-13-hotfix/pr-30102 
fix: Ambigous column in picklist query (backport #30102)
 2022-03-09 11:15:59 +05:30
Deepesh Garg
8fc105a186 fix: Item-wise sales history report 
(cherry picked from commit e2c144e9e3)
 2022-03-09 04:48:32 +00:00
Deepesh Garg
95792d8f32 fix: Remove unintentional changes 
(cherry picked from commit d9d4c2ce79)
 2022-03-09 04:48:07 +00:00
Deepesh Garg
b9ccbd50b4 fix: Ambigous column in picklist query 
(cherry picked from commit 517fbf1d1f)
 2022-03-09 04:48:06 +00:00
Deepesh Garg
3aace2f420 fix: Reload doctypes 2022-03-09 10:11:01 +05:30
mergify[bot]
07b8dd0300 fix: leave allocation records query (backport #30118) (#30120) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-08 23:48:44 +05:30
mergify[bot]
e8f17e582b test: Fix flaky tests (backport #30107) (#30119) 
Co-authored-by: Chillar Anand <anand21nanda@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-08 23:25:59 +05:30
Deepesh Garg
6a4c0234f5 Merge pull request #29918 from frappe/mergify/bp/version-13-hotfix/pr-29740 
fix: Multiple fixes in Gross Profit report (backport #29740)
 2022-03-08 23:01:40 +05:30
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