Deepesh Garg
ced3b13492
fix: Check for paid field
2020-12-12 19:31:05 +05:30
Deepesh Garg
68fce6d029
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_fix
2020-12-12 19:28:50 +05:30
Walstan Baptista
0baebbdafe
fix: added Purchase Order to Global Search ( #24055 )
2020-12-08 09:43:29 +05:30
Rucha Mahabal
063be69b58
fix(patch): set update_modified to False while setting issue/opportunity metrics ( #24073 )
2020-12-07 10:41:05 +05:30
rohitwaghchaure
0a672b69e6
Merge pull request #22859 from marination/pr-dn-return
...
feat: Return tracking in PR/DN
2020-12-06 22:43:34 +05:30
Deepesh Garg
2d1cfae596
fix: fieldname
2020-12-05 22:44:45 +05:30
Anurag Mishra
26b3328af7
fix: leave policy assignment patch ( #24061 )
2020-12-04 19:50:24 +05:30
Afshan
ccf5dc66e2
feat: multi-currency payroll ( #23519 )
...
* feat: multi-currency payroll
* fix: refactor and added conditions
* fix: uncommented code
* style: removed comments
* fix: missing argument
* style: styling changes
* fix: test cases
* Update asset_value_adjustment.py
* patch: update columns
* style: formating
* style: formatting
* fix: 1st review
* fix: refactor
* Revert "fix: refactor"
This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.
reverting to previous state
* Revert "fix: 1st review"
This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.
reverting before 1st review
* fix: 2nd review changes
* fix: test cases
* fix: added call to fetch exchange rate
* fix: remove unnecessary code
* fix: refactor
* fix: refactor patch
* fix: refactor
* fix: refactor
* fix: clear test data
* fix: slider
* feat: multi-currency payroll
* fix: refactor and added conditions
* fix: uncommented code
* style: removed comments
* fix: missing argument
* style: styling changes
* fix: test cases
* patch: update columns
* Update asset_value_adjustment.py
* style: formating
* style: formatting
* fix: 1st review
* fix: refactor
* Revert "fix: refactor"
This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.
reverting to previous state
* Revert "fix: 1st review"
This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.
reverting before 1st review
* fix: 2nd review changes
* fix: test cases
* fix: added call to fetch exchange rate
* fix: remove unnecessary code
* fix: refactor
* fix: refactor patch
* fix: refactor
* fix: refactor
* fix: clear test data
* fix: slider
* feat: Added company field in leave encashment and employee benefit
* refactor: Refactored multi-currency payroll patch
* fix: currency column in salary register
* refactor: Refactored code for making bank and return entry against employee advance
* fix: minor cleanup
* fix: fixed translation
* fix: removed salary component type
* fix: fixed sider issues
* fix: translation and slider
* style: formatted msg
* fix: fixed slider
* fix: travis
* fix: refactor
* fix: slider
* fix: slider
* fix: slider
* fix: travis
* fix: patch
* fix: patch
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: re-run travis
* fix: rerun travis
* fix: rerun travis
* fix: rerun travis
* fix: travis rerun
* fix: increased throttle_user_limit from 60 to 100
* fix: patch
* fix: patch
* fix: assign payroll payable account as default payroll payable account in SSA
* fix: removed debugger
* fix: slider
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-12-01 09:11:05 +05:30
Deepesh Garg
452cbcd6ea
fix: Update payments directly in Loan Interest Accrual
2020-11-30 10:55:12 +05:30
Deepesh Garg
681c0e297c
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_fix
2020-11-29 23:07:14 +05:30
Marica
307bd01504
Merge branch 'develop' into pr-dn-return
2020-11-25 17:24:03 +05:30
Anurag Mishra
755b773616
feat: Leave policy assignment ( #23112 )
...
* feat: Leave Policy Assignment
* feat: linking with leave allocation and valiations
* style: removed old code from leave period
* feat: Bulk Leave policy Assignment and grant Leaves
* fix: overlap validation
* feat: earned leaves based on joining date
* feat: automatic grant leave based on leave policy
* patch: create leave policy assignment based on employee current leave policy
* fix: dependent test cases
* test: Leave policy assignment
* fix: some enhancement
* style: break large function into small function
* fix:requested Changes
* fix(patch): Handled old Leave allocatioln
* fix:codacy
* fix: travis and sider,codacy
* fix: codacy
* fix: codacy
* fix: requested changes and sider
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-11-25 16:05:17 +05:30
Marica
9b897c4073
Merge branch 'develop' into pr-dn-return
2020-11-19 12:21:38 +05:30
Suraj Shetty
5e8b00207b
fix: Typo (Enchashment > Encashment) ( #23919 )
2020-11-17 10:58:09 +05:30
Deepesh Garg
a862eb25e6
fix: Make repayment entry only if amount exists
2020-11-13 17:57:57 +05:30
Deepesh Garg
37dc369af9
feat: Sync old shopify orders ( #23841 )
...
* feat: Sync old shopify orders
* fix: Old orders syncing by date
* fix: Remove unnecessary code
* fix: Remove unintentional changes
Co-authored-by: Saurabh <saurabh@erpnext.com>
2020-11-13 16:53:35 +05:30
Deepesh Garg
78690af440
fix: Update only if loans to close
2020-11-12 18:47:34 +05:30
Deepesh Garg
c51b340ddf
fix: Update closed loans
2020-11-12 18:43:43 +05:30
Deepesh Garg
b58dca8d94
fix: Only update open loans
2020-11-12 13:37:11 +05:30
Deepesh Garg
a2dc1740df
fix: Use autoname for loan creation
2020-11-11 13:57:10 +05:30
Deepesh Garg
0dc052e635
fix: Return loan type name
2020-11-11 12:57:16 +05:30
Deepesh Garg
13d1dda74b
fix: Handle loan type naming collisions
2020-11-11 11:07:17 +05:30
Deepesh Garg
73bde45bc5
fix: Pass updated loan type
2020-11-10 22:08:02 +05:30
Deepesh Garg
1c969d64a2
fix: Handle cases where same loan type is used for multiple companies
2020-11-10 20:25:35 +05:30
Deepesh Garg
928dc432ab
fix: Reload journal entry account doc
2020-11-09 17:17:12 +05:30
Deepesh Garg
4f2a64479d
fix: Patch for old loans
2020-11-09 17:00:09 +05:30
Marica
d845e8a53a
Merge branch 'develop' into pr-dn-return
2020-11-06 12:25:11 +05:30
Afshan
5c93ca7bef
fix: leave ledger patch ( #23807 )
...
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2020-11-05 15:45:15 +05:30
marination
28dd90f3dc
Merge branch 'develop' of https://github.com/frappe/erpnext into pr-dn-return
2020-11-02 15:16:31 +05:30
marination
d6596a169c
fix: Billing % Logic and Map Pending Qty only in PR and DN
...
- Billing % should consider unreturned amount as total
- While mapping to return doc, map unreturned amount
- Added field Received Qty in Stock UOM, to tally against Returned Qty in PR
- PR billing percentage updation custom function
- In patch set received qty in stock uom first, then update returned qty and billing
2020-11-02 15:07:48 +05:30
Rohit Waghchaure
e1781dc0bb
fix: patch to update reason for leaving in employee
2020-10-30 15:34:04 +05:30
Marica
7496ac0fe2
Merge branch 'develop' into pr-dn-return
2020-10-28 11:54:01 +05:30
Rushabh Mehta
1dd54e457d
Merge pull request #23734 from rmehta/quality-form-cleanup
...
fix(cleanup): Quality Module, cleanup of forms, dashboards etc.
2020-10-28 11:36:00 +05:30
Marica
cf8698fb0b
Merge branch 'develop' into pr-dn-return
2020-10-27 15:34:51 +05:30
Rushabh Mehta
ea49e30bfd
fix(cleanup): cleaned up forms
2020-10-26 15:30:52 +05:30
Rucha Mahabal
4887b69946
feat: Inpatient Medication Order and Entry ( #23473 )
...
* feat: Inpatient Medication Order
* feat: Inpatient Medication Entry
* feat: update medication orders on medication entry submission
* feat: added custom fields for medication references in Stock Entry
* feat: make stock entry if update stock is checked in IPMOE
* fix: handle cancel event for Inpatient Medication Entry
* fix(ux): add link and progress bar to dashboard
* refactor(ux): Adding Medication Orders without linking to Patient Encounter
* fix: make medication entry child table read only
* fix: filter stock items during manual medication order creation
* fix: codacy
* chore: tests for Inpatient Medication Order
* chore: tests for Inpatient Medication Entry
* fix: code clean-up
* fix: filter for inpatients in IPMO
* fix: add datetime validations for IPME filters
* fix: do not hardcode stock entry type
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-23 20:33:30 +05:30
Mangesh-Khairnar
5c29eb08c4
Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration
2020-10-19 18:29:46 +05:30
Mangesh-Khairnar
ebb8ee3dc6
fix(payment gateway account): add patch to set the payment channel as email
2020-10-19 18:27:40 +05:30
Marica
50b708f615
Merge branch 'develop' into pr-dn-return
2020-10-13 16:57:11 +05:30
Rohit Waghchaure
a86cab0bb2
fix: added patch to make custom field 'Print UOM after Quantity'
2020-10-08 16:41:23 +05:30
Rucha Mahabal
46d4180381
refactor: Issue form cleaned up and renamed Minutes to First Response field ( #23066 )
...
* refactor: re-order fields in Issue DocType
* refactor: rename Mins to First Response to First Response Time
* refactor: First Response Time Reports for Issue and Opportunity
* fix: added patch for renamed fields and setting durations
* chore: update CRM and Support Desk Pages for Response Time reports
* fix: first response time for opportunity report
* fix: patch
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-09-23 16:53:16 +05:30
Marica
ef2b5e8284
Merge branch 'develop' into pr-dn-return
2020-09-22 15:39:25 +05:30
gavin
d935b2753f
Merge branch 'develop' into youtube-analytics
2020-09-22 15:36:00 +05:30
Rohan
e42f08085b
fix: use Plaid's new API (develop) ( #23318 )
...
Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>
2020-09-21 13:14:07 +05:30
Marica
1807437fe0
Merge branch 'develop' into youtube-analytics
2020-09-11 16:18:23 +05:30
Marica
4153a9f8de
Merge branch 'develop' into pr-dn-return
2020-09-11 16:10:48 +05:30
Saqib
cd89994b33
fix: multiple pos issues ( #23297 )
...
* fix: returns can be made against unconsolidated invoices
* fix: indentation
* fix: mode of payment not fetching for pos returns
* patch: default pos profile print format
* fix: tests
* chore: clean up retail desk page
2020-09-10 19:28:46 +05:30
Marica
6520655d59
Merge branch 'develop' into youtube-analytics
2020-09-10 10:16:02 +05:30
marination
53cd60c217
fix: Patch reload doctype
2020-09-09 20:57:10 +05:30
marination
dc5f2aa8b8
chore: Patch to set returned qty in PR and DN
2020-09-09 17:56:20 +05:30