Deepesh Garg
435c22e403
Merge pull request #21244 from deepeshgarg007/employee_loan_fixes
...
fix: Employee loan fixes in new loan management module
2020-04-13 16:32:42 +05:30
anoop
0686c3d729
feat: multi company support
2020-04-13 16:32:35 +05:30
anoop
5f923fce2d
feat: multi company support
2020-04-13 16:30:00 +05:30
Deepesh Garg
40dcfd148b
fix: Import Error
2020-04-13 16:29:58 +05:30
Chinmay D. Pai
de8554d0dc
chore: force reload doctype before running patch
...
fixes Unknown column 'against_blanket_order' in 'field list'
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-13 16:03:22 +05:30
Marica
3ea95ee451
Merge pull request #21215 from vishdha/batch_message_v13
...
fix(UX): batch error message improved
2020-04-13 15:38:33 +05:30
Shivam Mishra
d9ce5843e5
chore: resolve conflicts
2020-04-13 13:43:04 +05:30
Shivam Mishra
affa2fba6b
feat: updated non-profit.json
2020-04-13 13:42:01 +05:30
Marica
3ce23858bf
Merge branch 'develop' into batch_message_v13
2020-04-13 13:20:25 +05:30
Deepesh Garg
03166fab56
Merge branch 'develop' of https://github.com/frappe/erpnext into employee_loan_fixes
2020-04-13 13:20:02 +05:30
Deepesh Garg
baa7521d02
fix: Allow repayment from Salary only for term loans
2020-04-13 13:18:11 +05:30
vishdha
cfaf638cc2
fix: batch message ux improved
2020-04-13 12:31:26 +05:30
Deepesh Garg
af27d61bee
fix: Employee loan test case and other fixes
2020-04-13 12:29:00 +05:30
anoop
d2224626c7
fix: company when creatign procedure, practitioner name added
2020-04-13 12:11:59 +05:30
anoop
174dcee155
fix: set company while creating encounter, fields rearranged
2020-04-13 12:09:06 +05:30
anoop
9a6bf4e0c9
fix: vitals added naimg series, minor field rearrangements
2020-04-13 11:56:09 +05:30
anoop
3441d123b6
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 11:46:41 +05:30
Saqib
2e45076dcf
Merge branch 'develop' into asset-cat-validation
2020-04-12 13:39:43 +05:30
Deepesh Garg
0865625482
Merge pull request #21177 from nextchamp-saqib/purchase-register-filters
...
feat: (minor) purchase register filters
2020-04-11 18:12:00 +05:30
Deepesh Garg
fdc0eb2dd2
Merge pull request #21235 from mujeerhashmi/gstr_3b_report_fix
...
fix: GSTR 3B Report tax amount calculation
2020-04-11 18:11:36 +05:30
Saqib Ansari
397f894a7c
fix: cannot iterate over dict_keys
2020-04-11 18:10:59 +05:30
Syed Mujeer Hashmi
58a16f1a3b
fix: GSTR 3B Report tax amount calculation
...
The tax amount after discount amount should be considered for tax
calculation.
Fixes #21231
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2020-04-11 00:52:10 +05:30
Deepesh Garg
5e274965cc
Merge pull request #21201 from marination/serial-no-status
...
fix: Added Status field in Serial No for filter and report builder
2020-04-10 20:48:06 +05:30
Rucha Mahabal
59e6c7730b
Merge branch 'develop' into healthcare_refactor
2020-04-10 20:32:37 +05:30
Deepesh Garg
470679f227
fix: SQL ssyntax error
2020-04-10 20:22:42 +05:30
Deepesh Garg
9b312bfbd0
Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-register-filters
2020-04-10 20:19:30 +05:30
Deepesh Garg
e2a5828f5e
Merge pull request #21193 from nextchamp-saqib/pay-entry-ux-fix
...
chore: hide redundant base received amount
2020-04-10 20:17:56 +05:30
Deepesh Garg
669c5c6370
fix: Syntax Error
2020-04-10 20:15:53 +05:30
Deepesh Garg
550771058a
fix: Code styling
2020-04-10 20:14:29 +05:30
Deepesh Garg
f7e216e285
fix: Employee loan fixes
2020-04-10 20:03:11 +05:30
Rucha Mahabal
1ff0cfd4f9
fix: merge conflicts
2020-04-10 18:58:25 +05:30
Shivam Mishra
ebcc46d837
feat: updated desk pages ( #21138 )
2020-04-10 18:52:05 +05:30
Saqib Ansari
c9d6630f17
fix: formatting
2020-04-10 12:43:54 +05:30
Saqib Ansari
debee1c977
fix: travis
2020-04-10 12:38:44 +05:30
Rucha Mahabal
41520f9fca
Merge branch 'develop' into healthcare_refactor
2020-04-09 19:16:31 +05:30
Rucha Mahabal
120d0e5796
fix: Fee Validity test
2020-04-09 19:16:01 +05:30
Deepesh Garg
724218418c
Merge pull request #21219 from frappe/michellealva-patch-1-1
...
fix: better error message due date
2020-04-09 17:38:48 +05:30
Michelle Alva
7f2477b72c
fix: better error message due date
...
show better error message payment schedule due date
2020-04-09 17:23:23 +05:30
Rucha Mahabal
d30023abac
fix: failing tests
2020-04-09 16:43:13 +05:30
rohitwaghchaure
cf17809c3f
Merge pull request #21156 from marination/mr-customer-provided-to-stock-entry
...
fix: Mapping Customer Provided Material Request to Stock Entry
2020-04-09 13:18:25 +05:30
Deepesh Garg
ef220c1989
Merge branch 'develop' into pay-entry-ux-fix
2020-04-09 12:54:33 +05:30
Nabin Hait
bd063c3fef
Update CODEOWNERS
2020-04-09 12:49:15 +05:30
Nabin Hait
2f5431378e
core: Added codeowners
2020-04-09 12:48:30 +05:30
Marica
3e84ab1349
fix: Error on any new doc from Shipping Rule. ( #21206 )
2020-04-09 12:01:10 +05:30
vishdha
0b34b90e71
fix: item_name added for message
2020-04-09 11:46:46 +05:30
marination
86e8b2a1c6
fix: Status field in Serial No for filter and report builder
2020-04-08 15:38:28 +05:30
gavin
74dd0e12e7
fix: enable validations for email and phone data fields ( #21199 )
2020-04-08 12:59:15 +05:30
Mangesh-Khairnar
49816b0c5f
fix(MWS): add new regions to marketplace ( #21196 )
...
* fix(MWS): add marketplace region for uae
* fix: rename the fields for mws integrations
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-08 12:57:14 +05:30
Saqib
562fd0eab0
fix: purchase return are allowed even when assets are not cancelled ( #20797 )
...
* fix: purchase return are allowed even when assets are not cancelled
* chore: test case
* fix: error message
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-08 12:11:40 +05:30
rohitwaghchaure
47c8ddb29b
Merge pull request #20962 from marination/pick-list-enhance
...
fix: Pick List Enhancements
2020-04-08 12:09:10 +05:30
