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,070 Commits 401 Branches 1,700 Tags
f31a7bde82e5d80faa7420c8ed7bfb2b4075607d
Commit Graph

39070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
f31a7bde82 fix: Update party type 
(cherry picked from commit e9d458b822)
 2022-03-13 11:44:13 +00:00
Deepesh Garg
5eeb09c84e fix: Sales and Purchase retrun optimization 
(cherry picked from commit 395b15058c)
 2022-03-13 11:44:13 +00:00
Ankush Menat
a04c7fc27d test: submit PR directly 
(cherry picked from commit 472fe8e319)
 2022-03-10 18:27:57 +05:30
Ankush Menat
b13389b99a test: flaky MR report test 
all test records are on same day so sorting was random in report rows.

(cherry picked from commit 6c54be0dcd)
 2022-03-10 18:27:57 +05:30
Ankush Menat
e428c36053 fix: only update valuation rate if not None 
(cherry picked from commit 7dd10367f4)
 2022-03-10 18:27:57 +05:30
mergify[bot]
f06554236f fix: fetch new fields from routing to bom (backport #30169) (#30171) 
* fix: fetch new fields in bom from routing

(cherry picked from commit 18e2a33a9b)

* fix: dont hardcode hour rate precision

(cherry picked from commit 362102e802)

# Conflicts:
#	erpnext/manufacturing/doctype/bom_operation/bom_operation.json

* fix: resolve conflict

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-10 18:09:09 +05:30
Ankush Menat
33ddbb4f3c fix: handle duplicate bins during item merge renames 
(cherry picked from commit 73901aad6f)
 2022-03-10 17:23:23 +05:30
Ankush Menat
de5500817f test: refactor item merge test and disable commits 
(cherry picked from commit b4d4ae6aa3)
 2022-03-10 17:23:23 +05:30
mergify[bot]
a5b25db880 fix: dont reset UOM in MR on every get_item_detail call (#30164) (#30165) 
(cherry picked from commit 4126455975)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-10 15:44:25 +05:30
Saqib Ansari
e89c181179 Merge pull request #30162 from frappe/mergify/bp/version-13-hotfix/pr-30103 
fix: Ignore missing customer group while fetching price list (backport #30103)
 2022-03-10 15:29:34 +05:30
Marica
584f0698ff Merge pull request #30163 from frappe/mergify/bp/version-13-hotfix/pr-30160 
fix: 'save_quotations_as_draft' checkbox not honoured (backport #30160)
 2022-03-10 15:12:02 +05:30
Marica
b529b5c0cb fix: Remove extra empty line after frappe imports 2022-03-10 14:53:48 +05:30
Marica
aec1916a0f fix: Merge Conflicts in test_shopping_cart imports 2022-03-10 14:49:05 +05:30
marination
62b50b6b63 fix: 'save_quotations_as_draft' checkbox not honoured 
- Make sure `request_for_quotation` considers `save_quotations_as_draft`
- Added test for checkout disabled quote

(cherry picked from commit a13e06156b)

# Conflicts:
#	erpnext/e_commerce/shopping_cart/test_shopping_cart.py
 2022-03-10 09:09:00 +00:00
mergify[bot]
4febcd86f8 fix: flaky tests (backport #30154) (#30161) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-10 14:38:08 +05:30
Saqib Ansari
3f0a4d9921 fix: Ignore missing customer group while fetching price list 
(cherry picked from commit e5fb871ef4)
 2022-03-10 09:06:42 +00:00
ChillarAnand
bb0be1699b fix: Ignore missing customer group while fetching price list 
(cherry picked from commit 9ace7d606c)
 2022-03-10 09:06:42 +00:00
Deepesh Garg
5e6879a7f7 Merge pull request #30159 from frappe/mergify/bp/version-13-hotfix/pr-29696 
fix: do not reset asset_category (backport #29696)
 2022-03-10 14:19:55 +05:30
Himanshu
5081438748 fix: do not reset asset_category (#29696) 
(cherry picked from commit 5193a63781)
 2022-03-10 08:15:21 +00:00
mergify[bot]
6c21642f32 fix(psoa): no such element: dict object['account'] (#30156) 2022-03-10 13:36:52 +05:30
Saqib Ansari
92a59fabe5 chore: imports (#30157) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-10 13:26:11 +05:30
Saqib Ansari
903e5d03a7 Merge pull request #30151 from frappe/mergify/bp/version-13-hotfix/pr-30145 
fix(psoa): add company filter to account (backport #30145)
 2022-03-10 13:16:44 +05:30
Saqib Ansari
cef8820369 fix(psoa): add company filter to account 
(cherry picked from commit fc42041f8f)
 2022-03-10 05:25:24 +00:00
mergify[bot]
31ba09b3d0 fix: program enrollment button labels (backport #30148) (#30149) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-10 10:07:47 +05:30
Marica
c9d0692fb4 Merge pull request #30141 from frappe/mergify/bp/version-13-hotfix/pr-30091 
feat: Include child item group products in Item Group Page & cleanup (backport #30091)
 2022-03-09 18:11:35 +05:30
mergify[bot]
e3387a06b6 fix: customer credit limit validation on update (#30126) 
(cherry picked from commit a0dc79332d)

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2022-03-09 17:49:34 +05:30
mergify[bot]
eb90d50946 fix: ignore non-unique swift numbers while migrating (#30139) 
(cherry picked from commit 4d8798b0ea)

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2022-03-09 17:49:11 +05:30
mergify[bot]
63e7d8c651 perf(asset): fetch only distinct depreciable assets (#30138) 
(cherry picked from commit 66f20209f6)

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
 2022-03-09 17:48:49 +05:30
Marica
458f264575 fix: Remove extra line 2022-03-09 17:35:01 +05:30
Marica
6241f9b9aa Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-30091 2022-03-09 17:33:37 +05:30
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
marination
ca41263736 fix: Linter 
(cherry picked from commit 7b37a74023)
 2022-03-09 11:16:56 +00:00
marination
c8026eb9df test: Test include_descendants in Item Group Product Listing 
- Also made include_descendants field's visibility dependant on show_in_website

(cherry picked from commit 3507cf5985)
 2022-03-09 11:16:55 +00:00
marination
7f234c7e34 feat: Include child item group products in Item Group Page & cleanup 
- Added 'Include descendants' checkbox, which will pull child item group products too
- Build item group filters in query engine file
- Include logic in filter engine
- Clean up Website section of Item Group page (UX)
- Add util to fetch child item groups including self

(cherry picked from commit b2755f6fdd)
 2022-03-09 11:16:55 +00:00
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