GangaManoj
be15e16b84
feat(Accounts Settings): Add 'Enable Discount Accounting' checkbox
2021-07-05 14:58:32 +05:30
Ashish Shah
4e6805b04e
fix: When Lead is created with mobile_no, mobile_no value gets lost (it is overwritten by phon value) ( #26116 )
...
Steps to reproduce
[1]Create a Lead.
[2]Enter Person Name(lead_name): XX
under Contact section, enter Phone(phone): 11 and Mobile No.(mobile_no):22
[3]Save it
[4] F12,
cur_frm.doc.phone : 11 (correct)
cur_frm.doc.mobile_no : 11 (incorrect)
[5]Under Address & Contact section ,check contact_html it shows
ty
Phone: 22 (correct)
Phone: 11 (in correct)
Actual:
mobile_no value is lost. it is overwritten by phone value
Expected:
mobile_no value should be retained
2021-07-02 13:35:04 +05:30
Jannat Patel
0a15a03522
fix: lms progress issue ( #26250 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-07-02 13:06:56 +05:30
Mohammed Yusuf Shaikh
6c2f66b0a4
fix: Added permission for employee to book appointment ( #26266 )
2021-07-02 12:21:44 +05:30
Mohammed Yusuf Shaikh
86f41839fe
fix: Added a message to enable appointment booking if disabled ( #26233 )
...
* fix: Added a message to enable appointment booking if disabled
* refactor: added translation for the message
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
* fix: added missing import
* fix: minor identation and space fix
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-07-02 12:19:24 +05:30
Ankush
8ebf32e18f
fix: undo changes to issue.py ( #26291 )
...
The fix ported from v13 to develop is not valid because of the new generic SLA feature.
Hard resetting the file to the previous version.
ec25d5938b
2021-07-02 11:09:19 +05:30
Deepesh Garg
8a5c7ea9b4
Merge branch 'develop' into patch-4
2021-07-01 18:08:22 +05:30
Jannat Patel
5a4251107c
feat: Project Portal Enhancements ( #26090 )
...
* fix: project portal enhancements
* fix: timesheet table and task nesting
* fix: semgrep and link issue
* fix: sider
* fix: project details view title
* fix: project progress pills
* fix: website route rule for project
* fix: multi level nesting
* fix: added subject and indentation
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-07-01 17:17:34 +05:30
Nabin Hait
07a74abcc3
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2021-07-01 12:55:13 +05:30
Nabin Hait
fa006402b8
fix: merge conflict
2021-07-01 12:47:28 +05:30
Ankush
d45e307f02
test: fix expected test failure ( #26275 )
...
reference: https://github.com/frappe/frappe/pull/13557
2021-07-01 12:38:09 +05:30
Nabin Hait
eee03fcbab
bumped to version 13.6.0
2021-07-01 12:57:13 +05:50
Nabin Hait
d7c4818a5d
Merge pull request #26281 from rohitwaghchaure/fixed-update-cost-not-working-for-draft-bom-pre
...
fix: update cost not working in the draft BOM
2021-07-01 12:30:55 +05:30
Rohit Waghchaure
f99f872946
fix: update cost not working in the draft bom
2021-07-01 12:02:37 +05:30
Rohit Waghchaure
87b4e6ea32
fix: employee selection not working in payroll entry
2021-07-01 12:02:03 +05:30
Nabin Hait
cf4e29a604
chore: Added change log for v13.6.0
2021-06-30 20:27:43 +05:30
Deepesh Garg
970d90f3b2
Merge pull request #25970 from GangaManoj/exchange-rate-difference-handling
...
feat: Exchange rate difference handling in procurement cycle
2021-06-30 20:25:39 +05:30
Anupam
8492bf040d
fix: feating employee in payroll entry
2021-06-30 17:17:43 +05:30
Deepesh Garg
cf7af62b05
fix: Code cleanup
2021-06-30 14:14:32 +05:30
GangaManoj
b4b6c8e262
Revert "fix: Test"
...
This reverts commit feed97ec53
.
2021-06-29 17:58:39 +05:30
Rucha Mahabal
1f10a99910
fix: Employee Inactive status implications ( #26245 )
2021-06-29 15:58:56 +05:30
Rucha Mahabal
8f2b8e47f7
fix: Employee Inactive status implications ( #26243 )
2021-06-29 15:58:30 +05:30
GangaManoj
d748e7f49c
fix: Create common function for fetching conversion rate details of linked docs
2021-06-28 22:39:43 +05:30
GangaManoj
506d5ac3d5
fix: Make exchange rate handling more efficient
2021-06-28 22:39:43 +05:30
GangaManoj
8f52db788a
fix(Purchase Invoice): Improve test for exchange rate difference handling
2021-06-28 22:39:41 +05:30
GangaManoj
a826fb8f95
fix(Purchase Receipt): Remove print statements
2021-06-28 22:38:59 +05:30
GangaManoj
3f5e7bf6d7
fix(Purchase Invoice): Fetch Purchase Receipt details using a function
2021-06-28 22:38:59 +05:30
marination
feed97ec53
fix: Test
2021-06-28 22:38:21 +05:30
GangaManoj
5314445d58
fix(Purchase Receipt): Add test for exchange rate difference handling
2021-06-28 22:02:57 +05:30
GangaManoj
d97505b277
fix(Purchase Receipt): Resolve difference caused by change in exchange rate
2021-06-28 22:02:22 +05:30
GangaManoj
206313d69b
fix(Purchase Invoice): Add test for exchange rate difference handling
2021-06-28 22:02:20 +05:30
GangaManoj
6233eaa3bb
fix(Purchase Invoice): Fix condition
2021-06-28 22:00:49 +05:30
GangaManoj
785a71dcd2
fix(Purchase Invoice): Resolve difference caused by change in exchange rate
2021-06-28 22:00:49 +05:30
Saqib
4277e4c94b
fix: unreachable test case ( #26234 )
2021-06-28 19:10:46 +05:30
rohitwaghchaure
3c97839826
Merge pull request #26130 from rohitwaghchaure/develop-production-plan-fix-to-show-parent-warehouse
...
fix: allow to select group warehouse while downloading materials from…
2021-06-28 17:18:55 +05:30
rohitwaghchaure
9bcc402f41
Merge pull request #26230 from rohitwaghchaure/fixed-fetch-bom-items-in-stock-reco-pre
...
fix: fetch batch items in stock reconciliation
2021-06-28 15:18:07 +05:30
Rohit Waghchaure
478360397d
fix: fetch batch items in stock reco
2021-06-26 22:31:03 +05:30
Rohit Waghchaure
5d5dc56f94
fix: removed values out of sync validation from stock transactions
2021-06-26 22:29:19 +05:30
Ankush Menat
6588a936d5
fix: order and time of operations for multilevel bom
...
- Order of operations was being sorted by idx of individual operations in
BOM table, which made the ordering useless.
- This adds ordering that's sorted from lowest level item to top level
item.
- chore: remove dead functionality. There's no `items` table. Required
item level operations get overwritten on fetching of items /
operations e.g. when clicking on multi-level BOM checkbox.
- test: add test for tree representation
- feat: BOMTree class to get complete representation of a tree
2021-06-25 20:16:11 +05:30
Ankush Menat
9af3f12411
fix(ux): show bom in operations child table
2021-06-25 20:16:11 +05:30
Ankush Menat
b4e7ee0e45
chore: remove dead and py2 compatibility code
...
form_grid_template doesn't exist
2021-06-25 20:16:11 +05:30
Ankush Menat
805ac4ffdf
fix: order and time of operations for multilevel bom
...
- Order of operations was being sorted by idx of individual operations in
BOM table, which made the ordering useless.
- This adds ordering that's sorted from lowest level item to top level
item.
- chore: remove dead functionality. There's no `items` table. Required
item level operations get overwritten on fetching of items /
operations e.g. when clicking on multi-level BOM checkbox.
- test: add test for tree representation
- feat: BOMTree class to get complete representation of a tree
2021-06-25 16:44:57 +05:30
Ankush Menat
305bbc7619
fix(ux): show bom in operations child table
...
# Conflicts:
# erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
2021-06-25 16:44:57 +05:30
Ankush Menat
923832c316
chore: remove dead and py2 compatibility code
...
form_grid_template doesn't exist
2021-06-25 16:44:57 +05:30
Deepesh Garg
8dd99c02cc
fix: Check for is None
2021-06-25 14:27:50 +05:30
Deepesh Garg
cae42b48f1
fix: Error while fetching item taxes
2021-06-25 14:27:43 +05:30
Deepesh Garg
6eb8d19cc9
fix: Check for is None
2021-06-25 14:02:12 +05:30
Deepesh Garg
cd36ba7e64
fix: Error while fetching item taxes
2021-06-25 14:02:04 +05:30
Ankush
532a224c44
fix: precision rate for packed items ( #26046 ) ( #26217 )
...
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
2021-06-25 13:28:01 +05:30
Alan
37a25308ae
fix: add validation for 'for_qty' else throws errors ( #25829 ) ( #26214 )
...
* fix: add validation for 'for_qty' else throws errors
* fix: check if for_qty is None
* fix: check purpose
* fix: add purpose to pick list get_doc
* fix: set as read only to prevent se from picking up value
* chore: undo changes to doctype modified timestamp
2021-06-25 12:40:38 +05:30