nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 16:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,037 Commits 401 Branches 1,700 Tags
db38c36bbacfbabb3fa8521d41dda698f2cfa3a6
Commit Graph

39037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marica
db38c36bba Merge pull request #30144 from frappe/mergify/bp/version-13-hotfix/pr-30000 
fix(translation) - correction for assets translation (backport #30000)
 2022-03-09 17:33:13 +05:30
mergify[bot]
d68cf1885f test: Added test for monthly attendance report (backport #29989) (#30143) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Chillar Anand <anand21nanda@gmail.com>
 2022-03-09 17:32:29 +05:30
Marica
4b4b104843 fix: Merge conflicts 2022-03-09 17:29:38 +05:30
hrzzz
f721a2929f fix(translation) - correction for translation 
(cherry picked from commit 16de29a3cb)

# Conflicts:
#	erpnext/assets/doctype/asset/asset_dashboard.py
 2022-03-09 11:53:10 +00:00
mergify[bot]
51f7ca856b revert: BU Schlüssel (a21f76f) (#30142) 
(cherry picked from commit 363ed9ccba)

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2022-03-09 16:51:58 +05:30
Deepesh Garg
b503b83960 Merge pull request #30137 from frappe/mergify/bp/version-13-hotfix/pr-30136 
fix: Remove tax invoice no field (backport #30136)
 2022-03-09 16:42:01 +05:30
Deepesh Garg
8d7418171b fix: Update timestamp 
(cherry picked from commit 9b8258479c)
 2022-03-09 10:51:05 +00:00
Deepesh Garg
856534c8a0 fix: Remove tax invoice no field 
(cherry picked from commit 8a2fe7a2e3)
 2022-03-09 10:51:05 +00:00
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]
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
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
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