Anupam K
c4c44a9a2b
Initial JS setup
2020-04-15 12:58:24 +05:30
marination
8890b6044d
fix: Patch fix, Travis fix and cleanup
...
- Added UOM column in Report
- Removed mandatory on `valid_till`
- Added list view indicator for Expired status in Supplier Quotation
- Sorted Labels in Chart and syntax cleanup
- Made labels Translatable
- Fixed patch
2020-04-15 12:31:12 +05:30
marination
1bab1539b1
Merge branch 'develop' of https://github.com/frappe/erpnext into quoted-item-report
2020-04-15 12:16:31 +05:30
sahil28297
0ebcb4733a
Merge pull request #21276 from ruchamahabal/patch-fix
...
fix: patch for Healthcare Refactoring
2020-04-15 11:59:12 +05:30
sahil28297
dd719ea151
Merge branch 'develop' into patch-fix
2020-04-15 11:58:02 +05:30
Rucha Mahabal
11121f4905
fix: patch for Healthcare Refactoring
2020-04-15 11:53:39 +05:30
Deepesh Garg
10b68295ad
Merge pull request #21275 from deepeshgarg007/loan_topup_test_fix
...
fix: Loan topup test
2020-04-15 11:23:33 +05:30
Deepesh Garg
9e9d44d139
fix: Loan topup test
2020-04-15 11:20:24 +05:30
marination
8179804405
refactor: Quoted Item Comparison Report
...
- Refactored Report View
- Added Chart
- Added 'valid_till' date in Supplier Quotation
- Added patch to set valid_till and daily job to set expiry status
2020-04-14 23:05:11 +05:30
Rohit Waghchaure
d0f6f1808b
fix: minor issues
2020-04-14 17:26:58 +05:30
vishdha
5008be1db5
fix: message bold
2020-04-14 17:17:26 +05:30
vishdha
10a6f4bd05
fix: Chart of account importer UX improved
2020-04-14 17:17:26 +05:30
Deepesh Garg
863d90b8a4
Merge pull request #21261 from Alchez/dev-stock-available-order-desk
...
fix: [minor] show stock UOM in POS (develop)
2020-04-14 17:01:33 +05:30
Rohan Bansal
a1b747c3f3
fix: show stock UOM in POS
2020-04-14 14:28:56 +05:30
Himanshu
b84333f26e
fix: move to hooks ( #21205 )
2020-04-14 13:02:03 +05:30
rohitwaghchaure
fc31dbef12
fix: on changing qty free item not removed ( #21251 )
2020-04-14 12:53:54 +05:30
Deepesh Garg
dd78eb3842
Merge pull request #21252 from nextchamp-saqib/tax-breakup-for-cn
...
fix: show positive taxes in credit notes
2020-04-14 12:41:25 +05:30
anoop
7ea8623229
Merge branch 'multi_company' of https://github.com/ESS-LLP/erpnext-healthcare into ess_pr_21253
2020-04-14 12:23:08 +05:30
anoop
4f3c46840f
feat: multi-company billing
...
sales onvoice - filter get items based on company
utils - company filters in all get item helper methods
utils - refactor appointemnt items
2020-04-14 12:22:32 +05:30
anoop
05e34ee9fb
company field added
2020-04-14 12:22:32 +05:30
anoop
d856a9aed3
feat: multi company support
2020-04-14 12:22:31 +05:30
anoop
aa1b9b57ac
feat: multi company support
2020-04-14 12:22:31 +05:30
anoop
b66833edfe
fix: company when creatign procedure, practitioner name added
2020-04-14 12:22:31 +05:30
anoop
b72d18c469
fix: set company while creating encounter, fields rearranged
2020-04-14 12:22:30 +05:30
anoop
e2a92246ea
fix: vitals added naimg series, minor field rearrangements
2020-04-14 12:22:30 +05:30
anoop
c1e25eabfd
feat: additional customer fileds
...
add customer_group, price list, currency etc.
rearrange and group fields
disable cusotmer edit after save (temp fix)
2020-04-14 12:22:29 +05:30
Shivam Mishra
8e91553d4b
Merge branch 'develop' of https://github.com/frappe/erpnext into razorpay-subscription
2020-04-14 12:00:38 +05:30
Shivam Mishra
4fdb4aa1d0
feat: use int for billing frequency
2020-04-14 12:00:15 +05:30
Shivam Mishra
cb354685d5
fix: linting issues
2020-04-14 12:00:02 +05:30
Marica
8636914e9a
fix: Lead Contact with blank first name via Customer ( #21247 )
2020-04-14 11:53:09 +05:30
Faris Ansari
64f01bddc8
fix: Set Price List in case of User Permissions ( #21237 )
...
Frontport of #18968
2020-04-14 11:51:48 +05:30
Marica
02c9332695
fix: Project Update Email Error ( #21208 )
...
* fix: Project Update Email Error
* Update project.json
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
2020-04-14 11:47:58 +05:30
Vishal Dhayagude
b1c2f4ef22
fix: str object not callable ( #21227 )
2020-04-14 11:42:52 +05:30
Mangesh-Khairnar
2e3548eb83
fix: consider revereted expired leaves entry ( #21257 )
2020-04-14 09:34:39 +05:30
anoop
afcf8efaaa
Merge branch 'multi_company' of https://github.com/ESS-LLP/erpnext-healthcare into ess_pr_21253
2020-04-13 19:45:49 +05:30
anoop
2bdf21bd30
feat: multi-company billing
...
sales onvoice - filter get items based on company
utils - company filters in all get item helper methods
utils - refactor appointemnt items
2020-04-13 19:45:17 +05:30
anoop
93d6794d28
company field added
2020-04-13 19:45:17 +05:30
anoop
0bdb5ba0c5
feat: multi company support
2020-04-13 19:45:17 +05:30
anoop
35932f2491
feat: multi company support
2020-04-13 19:45:17 +05:30
anoop
db00dbf90e
fix: company when creatign procedure, practitioner name added
2020-04-13 19:45:17 +05:30
anoop
b514b26242
fix: set company while creating encounter, fields rearranged
2020-04-13 19:45:17 +05:30
anoop
be2dc701c2
fix: vitals added naimg series, minor field rearrangements
2020-04-13 19:45:17 +05:30
anoop
407b33d7e0
feat: additional customer fileds
...
add customer_group, price list, currency etc.
rearrange and group fields
disable cusotmer edit after save (temp fix)
2020-04-13 19:45:16 +05:30
Deepesh Garg
78c0841d64
Merge pull request #21249 from Thunderbottom/blanket-order-patch-fix
...
chore: force reload doctype before running patch
2020-04-13 18:59:31 +05:30
sahil28297
c11ac6a73f
Merge pull request #21255 from ruchamahabal/fix-patch
...
fix: Healthcare Patch
2020-04-13 18:56:51 +05:30
Rucha Mahabal
79bc819f92
fix: Healthcare Patch
2020-04-13 18:51:04 +05:30
Rushabh Mehta
4c0484b60e
Merge pull request #20811 from ruchamahabal/healthcare_refactor
...
refactor: Healthcare Module
2020-04-13 17:16:02 +05:30
anoop
c01fb2a4d8
feat: multi-company billing
...
sales onvoice - filter get items based on company
utils - company filters in all get item helper methods
utils - refactor appointemnt items
2020-04-13 16:42:03 +05:30
Saqib Ansari
10a6a2d77f
fix: show positive taxes in credit notes
2020-04-13 16:40:13 +05:30
anoop
f90ea8d622
company field added
2020-04-13 16:34:28 +05:30
