nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-08 15:51:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,417 Commits 460 Branches 1,746 Tags
c31bf155f04e6f43622bcaaaa405e82f6f6bbe29
Commit Graph

37417 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frappe PR Bot
6a35d580e4 fix: Dimension filter query fix to avoid including disabled dimensions (#26988) (#27006) 
* reverting ot v12.7.1

* fix: Dimension filter query fix to not display disabled dimensions

Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
(cherry picked from commit 333e44eb47)

Co-authored-by: Subin Tom <36098155+nemesis189@users.noreply.github.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-18 18:46:25 +05:30
Frappe PR Bot
77ad668a6f fix: date_unchanged calculation in "Update Items" (#26992) (#27010) 
Branch corrected https://github.com/frappe/erpnext/pull/26058

  ERPNext generates "Cannot set quantity less than delivered quantity" error even the delivered qty is zero when user clicks "Update Items".
  "date_unchanged" variable gets false value because of new_date is string.

  "getdate(new_date)" corrects the date comparison.

  ![ERPNext_PR](https://user-images.githubusercontent.com/710051/121928377-c0263180-cd48-11eb-8cd9-eda7dace09d6.gif)

(cherry picked from commit d8a7abcd02)

Co-authored-by: Türker Tunalı <turkert@hotmail.com>
 2021-08-18 12:32:59 +00:00
Nabin Hait
5e1ed2d7eb fix: Message (Received Amount should be same as Paid Amount) 2021-08-18 16:46:32 +05:30
Anupam
36f18935d3 fix: email digest recipient patch 2021-08-18 16:30:45 +05:30
Anupam
01a538123b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into version-13-hotfix 2021-08-18 16:15:38 +05:30
Nabin Hait
44919ac807 fix: Additional salary processing 2021-08-18 16:14:48 +05:30
Frappe PR Bot
e555e8cf05 fix: Return Qty in PR/DN for legacy data (#27001) (#27003) 
(cherry picked from commit 112fc888f1)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-08-18 10:30:51 +00:00
Deepesh Garg
0f15ded0cd Merge branch 'payment_entry_validations_and_trigger' of https://github.com/deepeshgarg007/erpnext into payment_entry_validations_and_trigger 2021-08-18 15:58:46 +05:30
Deepesh Garg
46372fe5cd fix: Decide party account debit or credit on payment entry type instead of party type 2021-08-18 15:57:55 +05:30
Deepesh Garg
6950844a74 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payment_entry_validations_and_trigger 2021-08-18 15:29:48 +05:30
Rohit Waghchaure
8cd3ffc84d Merge branch 'version-13-pre-release' into version-13 v13.9.1 2021-08-18 13:00:35 +05:30
Rohit Waghchaure
9c1d739946 bumped to version 13.9.1 2021-08-18 13:20:35 +05:50
Frappe PR Bot
5e17b82779 fix: set account for change amount even if pos profile not found (#26986) (#26989) 
(cherry picked from commit 5fec44446e)

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-17 20:34:35 +05:30
Deepesh Garg
9c401e75bb Merge pull request #26980 from deepeshgarg007/payment_entry_unallocated_fix_v13 
fix: Incorrect unallocated amount calculation in payment entry
 2021-08-17 19:14:07 +05:30
Deepesh Garg
c8449702b4 Merge pull request #26981 from deepeshgarg007/payment_entry_unallocated_fix_v13_pre 
fix: Incorrect unallocated amount calculation in payment entry
 2021-08-17 19:13:27 +05:30
Frappe PR Bot
90818d57f1 fix: change print_format_type from Server to Jinja (#26374) (#26985) 
(cherry picked from commit a2966db1e5)

Co-authored-by: Mohammed Redah <mhbu50@gmail.com>
 2021-08-17 13:36:08 +00:00
Deepesh Garg
0a5dff1e1f test: Add test case for payment entry 2021-08-17 18:11:29 +05:30
Ankush Menat
333d962ac2 test: fix tests failing due to doc amend feature (bp #26656) (#26907) 
* test: fix test due to rename change

* test: fix attendance request tests

- Use `frappe.db.get_value` instead of `get_doc` for asserting values
- Get values after cancellation as reloading attendance doc breaks due to stale doc (primary key changed after cancel of attendance request)
- rollback everything on tearDown

* test: fix Shift Request test

- Use `get_value` instead of `get_doc`
- Remove unnecessary loop, only one shift assignment is made against a shift request
- Get value after cancel again. Get doc is not reliable since primary key changed after cancel

* test: fix POS Closing Entry Test

- Separated into two tests, one checks if SI cancelling is blocked, the other checks PCE cancel impact
- This is done because after cancel via assertRaises, damage done by cancel still exists or is partially comitted
- Dont use this partially cancelled doc for any assertions further, end test at exception assertion
- Use `get_value` to check SI docstatus, as its primary key changes after cancel

* test: fixed asset movement tests

- set cwip account in company to avoid value missing
- removed unused statement
- removed trailing spaces

* Revert "test: fix POS Closing Entry Test"

This reverts commit 8f1a3aef2e.

Co-authored-by: marination <maricadsouza221197@gmail.com>
 2021-08-17 18:01:39 +05:30
Deepesh Garg
2730f51ca9 test: Add test case for payment entry 2021-08-17 17:44:30 +05:30
Raffael Meyer
ace8cf965d fix: typo (#26967) 2021-08-17 16:13:28 +05:30
Deepesh Garg
e7143d8711 fix: Incorrect unallocated amount calculation in payment entry 2021-08-17 13:36:17 +05:30
Deepesh Garg
94f2c41475 fix: Incorrect unallocated amount calculation in payment entry 2021-08-17 13:31:17 +05:30
Sagar Vora
48a11591cc Merge pull request #26976 from resilient-tech/fix-incorrect-modified (#26979) 
fix: Incorrect `modified` time in documents that inherit from `StatusUpdater`
(cherry picked from commit d932cba38a)

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-08-17 13:21:00 +05:30
Sagar Vora
6e921b1ccc Merge pull request #26976 from resilient-tech/fix-incorrect-modified 
fix: Incorrect `modified` time in documents that inherit from `StatusUpdater`
(cherry picked from commit d932cba38a)
 2021-08-17 07:48:29 +00:00
Frappe PR Bot
133486a5c7 Merge pull request #26906 from ChillarAnand/label (#26972) 
fix: Changed label to "Inpatient Visit Charge" in appointment type
(cherry picked from commit 8c851b7019)

Co-authored-by: Chillar Anand <anand21nanda@gmail.com>
 2021-08-17 11:12:33 +05:30
Rohit Waghchaure
b27eeb54ae Merge branch 'version-13-pre-release' into version-13 v13.9.0 2021-08-17 10:05:50 +05:30
Rohit Waghchaure
03fdce5a19 bumped to version 13.9.0 2021-08-17 10:25:49 +05:50
rohitwaghchaure
6dd9e0194c Merge pull request #26968 from rohitwaghchaure/release-notes-v13-9-0 
chore: Release Notes v13.9.0
 2021-08-16 22:17:47 +05:30
Rohit Waghchaure
9722641847 chore: Release Notes v13.9.0 2021-08-16 20:38:38 +05:30
Deepesh Garg
a320a8f1df Merge pull request #26966 from deepeshgarg007/distributed_budget_variance_report_v13_pre 
fix: Budget variance missing values
 2021-08-16 18:28:19 +05:30
Deepesh Garg
94030e08f1 Merge pull request #26963 from deepeshgarg007/distributed_budget_variance_report_v13 
fix: Budget variance missing values
 2021-08-16 18:28:09 +05:30
Frappe PR Bot
663e550824 ci: ignore backports while checking docs (#26962) (#26965) 
[skip ci]

(cherry picked from commit 2a43fe1a22)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-08-16 18:20:07 +05:30
Deepesh Garg
58c1739eac fix: Budget variance missing values 2021-08-16 18:04:57 +05:30
Deepesh Garg
d076ba5c94 fix: Budget variance missing values 2021-08-16 18:02:15 +05:30
Frappe PR Bot
3c9b8dce21 feat: Training Event Status Update and Validations (#26698) (#26961) 
* fix: training event employee status not updated on feedback submission

* feat: update attendees status on training event status update

* test: Training Event and Feedback

* chore: remove unused import

(cherry picked from commit bf75ea70fb)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-08-16 17:57:14 +05:30
Frappe PR Bot
64dfbfaecb feat: enable track changes for leave type (#26917) (#26959) 
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit a9a24051c9)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
 2021-08-16 15:17:28 +05:30
Deepesh Garg
3b4258b817 Merge pull request #26958 from deepeshgarg007/export_type_mandatory_v13_pre 
fix: Add mandatory depends on condition for export type field
 2021-08-16 15:16:07 +05:30
Deepesh Garg
1351d6e3be Merge pull request #26957 from deepeshgarg007/export_type_mandatory_v13 
fix: Add mandatory depends on condition for export type field
 2021-08-16 15:15:43 +05:30
Deepesh Garg
2aa0daf47b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into export_type_mandatory_v13 2021-08-16 14:40:13 +05:30
Deepesh Garg
4b9c127494 Merge branch 'version-13-pre-release' of https://github.com/frappe/erpnext into export_type_mandatory_v13_pre 2021-08-16 14:38:54 +05:30
Deepesh Garg
b58b1127f3 fix: Add mandatory depends on condition for export type field 2021-08-16 14:36:50 +05:30
Deepesh Garg
5fddd27cab fix: Add mandatory depends on condition for export type field 2021-08-16 14:34:40 +05:30
Frappe PR Bot
321dd33015 fix: Org Chart fixes (#26952) (#26953) 
* fix: add z-index to filter to avoid svg wrapper overlapping

* fix: expand all nodes not working when there are only 2 levels

- added dom freeze while expanding all nodes and exporting

(cherry picked from commit 67e3971c3b)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-08-16 10:44:35 +05:30
Rucha Mahabal
67e3971c3b fix: Org Chart fixes (#26952) 
* fix: add z-index to filter to avoid svg wrapper overlapping

* fix: expand all nodes not working when there are only 2 levels

- added dom freeze while expanding all nodes and exporting
 2021-08-16 10:38:39 +05:30
Deepesh Garg
560483eb98 Merge pull request #26946 from GangaManoj/property-enable-discount-accounting 
fix: Make enable_discount _accounting a class property
 2021-08-14 18:06:17 +05:30
Ankush Menat
6aed9e26ac fix: unknown attribute "string_type" (#26947) 2021-08-14 10:45:43 +05:30
GangaManoj
20a5795d67 fix: Make enable_discount_accounting a class property 2021-08-13 19:23:57 +05:30
Marica
f1c9766748 Merge pull request #26943 from frappe-pr-bot/backport/version-13-pre-release/26942 
fix: (Stock Analytics) Copy previous balance dict object instead of assigning
 2021-08-13 16:01:21 +05:30
Frappe PR Bot
434692ad34 fix: Copy previous balance dict object instead of assigning (#26942) (#26944) 
- Due to plain assignment, dict mutation gave wrong monthly values

(cherry picked from commit fe2a34f171)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-08-13 10:26:26 +00:00
Marica
2e6899fbe4 fix: Copy previous balance dict object instead of assigning (#26942) 
- Due to plain assignment, dict mutation gave wrong monthly values

(cherry picked from commit fe2a34f171)
 2021-08-13 10:08:41 +00:00