rohitwaghchaure
1fce8b7475
Update leave_application.js
2020-07-08 12:40:01 +05:30
rohitwaghchaure
c7b63bfcaf
Merge pull request #22415 from Anurag810/payroll_entry_ux_fix_2.0
...
fix: Create salary slip button disappears
2020-07-08 12:35:24 +05:30
rohitwaghchaure
e862b3f9ce
Update payroll_entry.js
2020-07-08 12:34:15 +05:30
rohitwaghchaure
3431d42d12
Merge pull request #22610 from frappe/lead-creation-from-email
...
fix: Creating Lead from email
2020-07-08 12:27:18 +05:30
rohitwaghchaure
50f48f5176
Merge pull request #22592 from frappe/number-card-filter-fix
...
fix: crm dashboard Number card filter fix
2020-07-08 12:25:12 +05:30
rohitwaghchaure
fae570e0a2
Merge pull request #22612 from netchampfaris/fix-item-price-labels
...
fix: Remove trailing spaces from labels
2020-07-08 12:14:21 +05:30
Faris Ansari
0a06580e2c
fix: Update message
...
Co-authored-by: gavin <gavin18d@gmail.com>
2020-07-08 12:06:28 +05:30
Deepesh Garg
9071a7de82
fix: Add default cost center in payment reconciliation JV
2020-07-08 11:27:25 +05:30
Kaviya Periyasamy
923ed8a741
fix: log type mandatory error while exposing api call to employee checkin
2020-07-08 11:15:04 +05:30
Faris Ansari
f3a6e30e6a
fix: Check if homepage is not setup-wizard
...
The new desk changes sets the default homepage to 'workspace'. To avoid
problem in the future, check if the value is not setup-wizard.
Also throw an exception if the check passes, so it exits with error.
2020-07-08 10:45:55 +05:30
Deepesh Garg
addd1e842b
Merge pull request #22568 from ahmadpak/develop
...
fix: Item Tax Template permissions as per company
2020-07-08 10:08:53 +05:30
Faris Ansari
8c5c74ca06
fix: Remove trailing spaces from labels
2020-07-08 09:20:13 +05:30
Anupam K
6669f7457a
hr dashboard number card filter fix
2020-07-08 01:24:53 +05:30
Anupam K
8bc92b90f5
updating lead.py
2020-07-08 00:56:21 +05:30
Rucha Mahabal
3d14011d23
fix: allow creating SLA documents even if SLA tracking is not enabled
2020-07-07 18:30:54 +05:30
Afshan
e3269039d3
feat: added columns to get complete analysis for material request
2020-07-07 18:01:37 +05:30
Marica
4d5d706a4b
Merge branch 'develop' into error-message
2020-07-07 16:41:39 +05:30
Mitali Deshpande
f642be9727
fix: Changed error message in the Product Bundle
2020-07-07 16:14:01 +05:30
Marica
750069b6de
Merge pull request #22544 from Thunderbottom/whitelist-query
...
fix: whitelist all query functions for search widget
2020-07-07 15:52:02 +05:30
Marica
f4d0a3e7b0
Merge branch 'develop' into whitelist-query
2020-07-07 15:42:42 +05:30
rohitwaghchaure
546cfdaac2
Merge pull request #22601 from deepeshgarg007/payment_reco_company
...
fix: Payment reco error in multi-company setup
2020-07-07 15:32:36 +05:30
Deepesh Garg
ca351e3549
fix: Pass company
2020-07-07 14:37:17 +05:30
Marica
8dbdf0902f
Merge branch 'develop' into whitelist-query
2020-07-07 14:29:24 +05:30
marination
32f3d24dac
fix: Employee benefit application & quality inspection whitelist
2020-07-07 14:31:49 +05:30
Deepesh Garg
e2fdff5777
fix: Payment reco error in multicompany setup
2020-07-07 14:14:07 +05:30
rohitwaghchaure
93732ae21b
Merge pull request #22598 from AfshanKhan/fix-cost-center-option-for-expense-claim
...
fix: cost center should only show option of selected company
2020-07-07 12:24:56 +05:30
Marica
7860d9e699
Merge branch 'develop' into whitelist-query
2020-07-07 11:53:19 +05:30
Afshan
70b3edd502
fix: format according to cordacy
2020-07-07 00:03:45 +05:30
Afshan
3819c0bf28
fix: cost center should only show option of selectedcompany
2020-07-06 23:52:11 +05:30
Marica
d187a6ac48
Merge branch 'develop' into exploded-item-rate
2020-07-06 23:35:37 +05:30
marination
4355d3cf0f
fix: Exploded Item Rate
2020-07-06 23:15:08 +05:30
Marica
5f299a08bd
fix: General Message in previous doc validation for buying and selling ( #22546 )
2020-07-06 18:26:56 +05:30
Marica
e3e5fd7e74
fix: Skip Progress and Completed by fields on Task Duplication ( #22565 )
2020-07-06 18:26:19 +05:30
rohitwaghchaure
39933a4db1
Merge pull request #22441 from nextchamp-saqib/asset-delete-fix
...
fix: cannot cancel asset and asset movement
2020-07-06 16:13:55 +05:30
Anupam K
8b26ea720b
Merge branch 'develop' of https://github.com/frappe/erpnext into number-card-filter-fix
2020-07-06 15:21:53 +05:30
rohitwaghchaure
71e1d2cc79
Merge pull request #22563 from AndyOverLord/patch-6
...
fix: fetch item price in sales invoice
2020-07-06 14:18:03 +05:30
Deepesh Garg
05738bd29a
fix: Remove print statements
2020-07-06 13:40:48 +05:30
rohitwaghchaure
661bc46b81
Merge pull request #22571 from marination/quality-feedback
...
fix: Quality Feedback and Template (minor)
2020-07-06 13:17:10 +05:30
rohitwaghchaure
1cc1fd4f86
Merge pull request #22576 from marination/party-details
...
fix: Check for Company before trying to fetch party details
2020-07-06 12:42:16 +05:30
Deepesh Garg
92a03aa5db
Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts
2020-07-06 12:37:28 +05:30
rohitwaghchaure
e5d9ebe32e
Merge pull request #22577 from deepeshgarg007/coa_fiscal_year_fix
...
fix: Consider company fiscal year for getting balance
2020-07-06 12:34:56 +05:30
Anupam K
e88f2bb053
number card filter
2020-07-06 12:34:05 +05:30
Marica
7e198527b9
Merge branch 'develop' into party-details
2020-07-06 11:09:20 +05:30
Saqib
819879dd12
Merge branch 'develop' into asset-delete-fix
2020-07-05 18:38:51 +05:30
Deepesh Garg
be05c4e14a
fix: Codacy and minor fixes
2020-07-05 18:16:16 +05:30
Deepesh Garg
4993ab5191
Merge branch 'develop' into develop
2020-07-04 18:28:06 +05:30
rohitwaghchaure
3292e63dee
Merge pull request #22569 from rohitwaghchaure/fixed-travis-failing-due-to-loan-issue
...
fix: travis
2020-07-04 14:14:52 +05:30
Rohit Waghchaure
f0f4f70a76
fix: test case for salary slip
2020-07-04 13:30:22 +05:30
Deepesh Garg
96d40ec9da
fix: Consider company fiscal for getting balalnce
2020-07-03 22:59:00 +05:30
marination
e27b996e38
fix: Check for Company before trying to fetch party details
2020-07-03 22:12:00 +05:30
