Rucha Mahabal
bf26b10df4
Merge branch 'develop' into sla-enhancements
2020-06-15 13:15:03 +05:30
Anurag Mishra
45b6fed029
fix: added some standard filters in expense cliam
2020-06-15 12:44:55 +05:30
Anurag Mishra
a2cf79da0f
fix: allow to enter Releaving date if status = Left
2020-06-15 12:28:31 +05:30
Deepesh Garg
0d880079b1
fix: Validation for group cost center
2020-06-15 12:23:24 +05:30
marination
8d68ba37bb
Merge branch 'update-items-permission-fix' of https://github.com/nextchamp-saqib/erpnext into update-items-permission-fix
2020-06-15 12:18:16 +05:30
marination
b7e94cc742
fix: Travis
2020-06-15 12:16:30 +05:30
Deepesh Garg
817cbc4b48
fix: Minor fixes in cost center
2020-06-15 12:07:04 +05:30
Marica
7dd92f15fa
Merge branch 'develop' into update-items-permission-fix
2020-06-15 11:44:59 +05:30
marination
359e934cd2
fix: Travis
2020-06-15 11:44:29 +05:30
Abhishek Balam
6c4a24a6c3
cleanup
2020-06-15 11:36:56 +05:30
Abhishek Balam
1a28227daa
fix merge conflict
2020-06-15 10:58:51 +05:30
Deepesh Garg
11253a91f1
Merge pull request #22199 from marination/qi-on-return
...
fix: Don't prompt for Quality Inspection on Return Documents.
2020-06-14 17:09:51 +05:30
rohitwaghchaure
25f49d59c5
Merge pull request #22233 from deepeshgarg007/pi_billing_address
...
fix: Billing address in for Purchase documents
2020-06-14 15:10:43 +05:30
rohitwaghchaure
c5a2803a1c
Merge pull request #22239 from rohitwaghchaure/item-none-not-found-opening-creation-tool-develop
...
fix: item none not found while making sales invoice using opening inv…
2020-06-14 15:09:38 +05:30
rohitwaghchaure
c5754efccf
Merge pull request #22235 from frappe/opportunity-dashboard
...
fix: social media post permission issue
2020-06-14 15:08:43 +05:30
Rohit Waghchaure
d6f9a51cbb
fix: item none not found while making sales invoice using opening invoice creation tool
2020-06-14 14:46:49 +05:30
Deepesh Garg
7640bef728
Merge pull request #22237 from deepeshgarg007/financial_statement_v13
...
fix: Handle cancelled entries in financial statements
2020-06-14 13:28:58 +05:30
Deepesh Garg
103645835b
fix: Handle cancelled entries in financial statements
2020-06-14 13:27:19 +05:30
Deepesh Garg
5bf6bec656
fix: Consider Overseas category in RCM
2020-06-14 13:18:08 +05:30
Anupam K
234b5f9a8c
sm-post-permission-fix
2020-06-14 10:34:58 +05:30
Anupam K
c2d1ed7a34
Merge branch 'develop' of https://github.com/frappe/erpnext into opportunity-dashboard
2020-06-14 00:09:45 +05:30
Anupam K
65e7a2e7a6
opportunity-dashboard-fix
2020-06-14 00:05:38 +05:30
Deepesh Garg
3a16b033b6
Merge branch 'develop' of https://github.com/frappe/erpnext into rcm_develop
2020-06-13 22:50:14 +05:30
Deepesh Garg
6760077674
fix: Billing address in for Purchase documents
2020-06-13 22:40:23 +05:30
Deepesh Garg
dcdd1f3d9b
Merge pull request #22227 from frappe/opportunity-dashboard
...
fix: Links in opportunity dashboard
2020-06-13 22:16:10 +05:30
Deepesh Garg
5f4330621c
Merge pull request #22231 from deepeshgarg007/financila_satement_immutable
...
fix: Handle cancelled entries in financial statements
2020-06-13 21:19:20 +05:30
Deepesh Garg
cc4943d54d
fix: Distributed cost center query updation
2020-06-13 21:13:52 +05:30
Deepesh Garg
d80d442aa1
fix: Do not select cancelled entries in financial statements
2020-06-13 21:12:19 +05:30
Deepesh Garg
f3261794d9
Merge pull request #22230 from deepeshgarg007/financial_statement_to_date_v13
...
fix: Data not appearing properly for some fiscal_year in financial statements
2020-06-13 19:27:38 +05:30
Deepesh Garg
15231aa60d
fix: Data not appearing properly for some fiscal_year in financial statemets
2020-06-13 19:26:39 +05:30
Anupam K
8bc414620b
opportunity-dashboard-fix
2020-06-13 13:11:43 +05:30
Anurag Mishra
5b8a47d072
fix: patch for expense claim ( #22226 )
2020-06-13 01:04:32 +05:30
Deepesh Garg
28fecb1b29
Merge pull request #22198 from scmmishra/membership-fixes
...
fix: verification for razorpay hooks
2020-06-12 21:28:07 +05:30
Deepesh Garg
bf66d1dca7
Merge pull request #22206 from frappe/clarkejj-patch-1
...
fix: TypeError in Stock ageing report
2020-06-12 21:14:15 +05:30
John Clarke
15e4ea0472
Merge branch 'develop' into clarkejj-patch-1
2020-06-12 07:55:49 -06:00
John Clarke
85f237257a
Thanks so much for your pointer Marica - that violation is clear and obvious to me in retrospect, but a good relearning experience in any case
2020-06-12 07:22:14 -06:00
Anurag Mishra
7558e64d6d
fix: set_query in leave application ( #22197 )
2020-06-12 17:37:59 +05:30
John Clarke
677978dd00
Update stock_ageing.py
...
As reviewer Deepesh Garg advised thanks! batch[0] can be int of float - see line 49 - so change proposed cint to flt
2020-06-12 05:53:24 -06:00
Anurag Mishra
ec54653852
fix: Child is shown in Parent process if added from tree view
2020-06-12 17:02:31 +05:30
rohitwaghchaure
ee6f80e25b
Merge pull request #22213 from vishdha/fix-credit-limit-notification_v13
...
feat: notify credit controller role users with credit limit extension request
2020-06-12 16:37:41 +05:30
marination
f9c4b20985
fix: Added PO test and conversion factor fix
...
- Don't change conversion factor if stock uom and uom is the same
- Added PO test
- Added Accounts User basic role in PO
- Minor fixes, wrong variables
2020-06-12 15:49:53 +05:30
Rucha Mahabal
959efe88f0
Merge pull request #22217 from sahil28297/fix_set_company_healthcare_patch_develop
...
fix(patch): escape special characters in company field
2020-06-12 15:34:15 +05:30
Deepesh Garg
7e974c9e2c
fix: Test Cases
2020-06-12 15:29:40 +05:30
Sahil Khan
182c1f860b
fix(patch): escape special characters in company field
2020-06-12 15:16:20 +05:30
Abhishek Balam
86ea75e49e
fix(HR): Change Due Advance Amount to Pending Amount ( #22123 )
...
* rename 'Due Advance Amount' field to 'Pending Amount'
* changed fieldname and references for easier debugging
* added patch for moving data
* added newline added
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2020-06-12 13:13:14 +05:30
mergify[bot]
5a176a78b7
feat(Attendance): Add In and Out time to attendance ( #21547 ) ( #22212 )
...
* feat(Attendance): Add In and Out time to attendance
Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com>
* fix:add depends in attendance IN time and OUT time
Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com>
(cherry picked from commit 90957b7f74
)
Co-authored-by: Vignesh S <svignesh0308@gmail.com>
2020-06-12 13:01:22 +05:30
Shivam Mishra
3bf18509ba
Merge branch 'develop' into membership-fixes
2020-06-12 07:27:20 +00:00
Rohan Bansal
ccd03bc120
feat: notify credit controller role users with credit limit extension requests
2020-06-12 12:48:54 +05:30
Vignesh S
90957b7f74
feat(Attendance): Add In and Out time to attendance ( #21547 )
...
* feat(Attendance): Add In and Out time to attendance
Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com>
* fix:add depends in attendance IN time and OUT time
Co-authored-by: Karthikeyan S <skarthikeyan1410@gmail.com>
2020-06-12 12:32:55 +05:30
Marica
c62a6df016
Merge branch 'develop' into qi-on-return
2020-06-12 12:31:20 +05:30