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
Abhishek Balam
ea30e0a37d
fix: change modified date
2021-01-21 19:38:37 +05:30
Abhishek Balam
ae3a9c1ead
fix: remove payroll card from HR workspace
2021-01-21 19:33:19 +05:30
Suraj Shetty
f0ff23eac3
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-21 19:07:57 +05:30
Saqib
577d2bed6e
fix: failing einvoice test ( #24434 )
2021-01-21 18:43:55 +05:30
Suraj Shetty
bed55bb7ba
fix: Use multisql to support postgres
2021-01-21 18:36:50 +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
Suraj Shetty
5f52f8d473
fix: Temporarily comment out help article link in issue timeline
2021-01-21 16:50:47 +05:30
Suraj Shetty
8670dda5b7
fix: Use abbr method for abbr
2021-01-21 16:47:04 +05:30
Rucha Mahabal
f1cca59d80
feat: update expiry for memberships
2021-01-21 16:36:15 +05:30
Suraj Shetty
2dcdeb8231
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-21 15:33:42 +05:30
Suraj Shetty
17ed3fc270
fix: Set css_style fallback
2021-01-21 15:33:36 +05:30
prssanna
f3d321fb82
fix: remove console.log
2021-01-21 15:31:42 +05:30
Rucha Mahabal
b9781a4675
fix: membership test cases
2021-01-21 15:13:29 +05:30
Suraj Shetty
0c0155e885
fix: Make birthday messages translatable
2021-01-21 14:59:19 +05:30
Suraj Shetty
8b1a720ae8
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-21 14:32:45 +05:30
Suraj Shetty
164fe37fa0
fix: Employee birthday reminder
2021-01-21 14:32:35 +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
prssanna
9f1a156307
Merge branch 'shopping-cart' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-21 13:04:58 +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
pateljannat
f110759897
fix: date validation
2021-01-20 18:12:48 +05:30
prssanna
b00eb1b0cc
feat: shopping cart page
2021-01-20 17:52:54 +05:30
prssanna
706eae7cac
fix: product page fixes
2021-01-20 17:47:25 +05:30
prssanna
ac7bc78afe
fix: show product price in item card
2021-01-20 17:46:19 +05:30
prssanna
599322871a
fix: product query issues
2021-01-20 17:44:08 +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
Suraj Shetty
2e67a41c27
fix: Update birthday avatar code
2021-01-20 10:12:01 +05:30
Afshan
c69ab6d184
fix: select sal comp while making sal struct
2021-01-19 19:29:31 +05:30
