Afshan
217440952f
fix: slider
2021-01-22 15:39:59 +05:30
Afshan
02d495f1fb
fix: added query for fetching salary component
2021-01-22 15:39:59 +05:30
Rucha Mahabal
6058ea88e8
fix: SLA not applied automatically when priority is missing ( #24447 )
2021-01-22 13:35:08 +05:30
Marica
5631d014a7
Merge branch 'develop' into item-wise-purchase-registry-item-name-error
2021-01-22 12:35:35 +05:30
Deepesh Garg
0d26d24164
Merge pull request #24414 from Alchez/dev-irs-1099-year
...
fix: use supplied year for IRS 1099 forms
2021-01-22 12:17:43 +05:30
Deepesh Garg
cf7209f3d4
fix: Project Template patch
2021-01-22 11:47:13 +05:30
Jannat Patel
02a7af1e6c
fix: full form for opportunity in crm dashboard ( #24436 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-01-22 10:03:29 +05:30
Rucha Mahabal
858ad20dd0
Merge branch 'develop' into service-units-in-appointment
2021-01-22 09:09:29 +05:30
Rucha Mahabal
7201498801
Merge branch 'develop' into patient-history-enhancements
2021-01-22 09:04:37 +05:30
Rucha Mahabal
b9a21c4824
feat: added search to the Select fields dialog in Patient History Settings
2021-01-22 09:00:40 +05:30
Rucha Mahabal
ded08245cc
fix: duplicate filters added on patient change
2021-01-22 08:52:17 +05:30
rohitwaghchaure
3afc6b1333
Merge pull request #24437 from AfshanKhan/fix-stock-ageing
...
fix: stock ageing should not take cancelled stock entries.
2021-01-21 23:09:41 +05:30
Rucha Mahabal
8d60d301c8
Merge pull request #23865 from scmmishra/membership-enhancements-2
...
feat: enhancements to erpnext membership
2021-01-21 21:10:53 +05:30
Rucha Mahabal
7a21e40527
Merge branch 'develop' into membership-enhancements-2
2021-01-21 20:21:17 +05:30
Rucha Mahabal
02e424fae2
chore: Add description for settings
2021-01-21 20:16:17 +05:30
Rucha Mahabal
bcc0674d37
fix: test
2021-01-21 19:52:13 +05:30
Saqib
577d2bed6e
fix: failing einvoice test ( #24434 )
2021-01-21 18:43:55 +05:30
Afshan
96edfd93c9
fix: stock ageing should not take cancelled stock entries.
2021-01-21 18:22:35 +05:30
Rucha Mahabal
eee71f37d8
fix: test
2021-01-21 17:47:20 +05:30
Rucha Mahabal
f1cca59d80
feat: update expiry for memberships
2021-01-21 16:36:15 +05:30
Rucha Mahabal
b9781a4675
fix: membership test cases
2021-01-21 15:13:29 +05:30
Rucha Mahabal
f3e3f80102
Merge branch 'develop' into membership-enhancements-2
2021-01-21 13:24:39 +05:30
Rucha Mahabal
d98b506478
fix: patch
2021-01-21 13:23:59 +05:30
Rucha Mahabal
b48eab972e
fix: sider issues
2021-01-21 13:00:10 +05:30
Marica
d1e6303d67
Merge branch 'develop' into item-wise-purchase-registry-item-name-error
2021-01-21 12:14:47 +05:30
Rucha Mahabal
3af46cc6cc
fix: show custom buttons after save
2021-01-21 11:59:34 +05:30
Rucha Mahabal
4284ad880b
fix: create member from membership for website users only
2021-01-21 11:54:14 +05:30
Rucha Mahabal
53d0eebbe8
fix: patch for renaming field in Membership Settings
2021-01-20 23:22:08 +05:30
Rucha Mahabal
bc49815d54
refactor: missing validations, code clean-up
2021-01-20 23:14:27 +05:30
Rucha Mahabal
fa4b3ba505
fix: basic validations for Membership Type Linked Item
2021-01-20 21:59:27 +05:30
Rucha Mahabal
3575939386
fix: sider issues
2021-01-20 20:48:51 +05:30
Afshan
b8b23663e6
fix: query for salary component in salary structure
...
fix: query for salary component in salary structure
2021-01-20 17:42:06 +05:30
Afshan
36e3e05a0e
fix: query for salary componet in salary structure
2021-01-20 16:48:42 +05:30
Afshan
53edb872c7
Merge pull request #24424 from AfshanKhan/fix-add-stat-comp-in-sal-struct
...
fix: allow statistical component in salary structure.
2021-01-20 15:21:04 +05:30
Afshan
912647f4f2
fix: allow statistical component in salary structure.
2021-01-20 13:58:32 +05:30
Saqib
e2ed2324c3
fix: (e-invoicing) qrcode image generation ( #24395 )
...
* fix: invalid taxable value of item for e-invoice
* fix: qrcode image duplicate error
* fix: net total discount calculation
* fix: auto fetch auth token
2021-01-20 13:17:42 +05:30
Rucha Mahabal
bd02a42904
Merge branch 'develop' into membership-enhancements-2
2021-01-20 12:49:37 +05:30
Afshan
0ff9acfc9f
Merge pull request #24415 from AfshanKhan/sal-comp-err
...
fix: select sal comp while making sal struct
2021-01-20 12:37:53 +05:30
Deepesh Garg
60a8ba5cbd
Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency
2021-01-20 10:30:52 +05:30
Afshan
c69ab6d184
fix: select sal comp while making sal struct
2021-01-19 19:29:31 +05:30
Rohan Bansal
97b9995f8f
fix: use supplied year for IRS 1099 forms
2021-01-19 19:10:03 +05:30
rohitwaghchaure
c474caba70
Merge pull request #24354 from rohitwaghchaure/fixed-incorrect-key-in-subcontract-develop
...
fix: incorrect serial no in the subcontracted purchase receipt
2021-01-19 15:08:53 +05:30
Rucha Mahabal
a28579a130
fix: sider issues
2021-01-19 14:16:44 +05:30
Rucha Mahabal
f39cbd3a1d
test: appointment booking for admission service unit
2021-01-19 13:59:03 +05:30
Jannat Patel
953960b193
Merge branch 'develop' into item-wise-purchase-registry-item-name-error
2021-01-19 10:44:49 +05:30
Deepesh Garg
6fb66f9428
Merge pull request #24362 from ruchamahabal/year-to-date-in-salary-components
...
feat(Payroll): compute Year to Date for Salary Slip components
2021-01-19 09:40:47 +05:30
marination
957615bec8
fix: Stricter validations
...
- Validation for overreceipt on Purchase Invoice, Stock Entry, Purchase Receipt & Stock Reconciliation
- Every incoming stock transaction must be checked to avoid overcapacity
- However application of rule and splitting only on certain doctypes
- Validate capacity < stock balance on save in putaway rule, irrespective
2021-01-18 23:47:24 +05:30
Marica
6ac51edc56
Merge branch 'develop' into putaway
2021-01-18 17:47:25 +05:30
Saqib
7b8eac958e
feat: re-linking bank accounts with plaid ( #24392 )
2021-01-18 16:44:41 +05:30
pateljannat
6bec696396
fix: item_group fallback
2021-01-18 16:21:56 +05:30
