Rucha Mahabal
170d2efd35
fix(Payroll): Exchange Rate not getting set in Salary Slip ( #25013 )
2021-03-30 11:02:46 +05:30
Mohammad Hasnain Mohsin Rajan
f29c075bc3
fix: patch regional fields for old companies ( #24999 )
...
* fix: patch regional fields for old companies
* chore: fix sider
2021-03-25 12:56:13 +05:30
Nabin Hait
fe3529b194
fix: merge conflict
2021-03-11 16:45:41 +05:30
Nabin Hait
6e3668dc30
fix: merge conflict
2021-03-11 16:14:27 +05:30
Ankush Menat
2b61491adb
fix: use account_name only in consolidated report ( #24840 )
...
Don't use account_number and only rely on account_name for preparing
consolidated financial statement.
Related issue: ISS-20-21-10217
2021-03-11 16:05:58 +05:30
Rucha Mahabal
0b29f87fa2
feat(Non Profit): 80G Certificates and Donations ( #24848 )
...
* feat(Non Profit): 80G Certificates and Donations
* fix(Membership): Generate Invoice for membership webhook only if automation is enabled (#24849 )
2021-03-11 16:02:23 +05:30
Rucha Mahabal
d1e331f77f
fix(Membership): Generate Invoice for membership webhook only if automation is enabled ( #24849 )
2021-03-11 15:27:22 +05:30
Rucha Mahabal
be2c1fca7b
feat(Non Profit): 80G Certificates and Donations ( #24657 )
...
* feat: 80G Certificates
* feat: add non-profit custom fields for India
* feat: 80G Certificate print format for memberships
* feat: Donation doctype and API endpoint to capture donations via razorpay
* chore: Rename Membership Settings to Non Profit Settings
* chore: clean up Non Profit Settings
- Rename fields, better labels
- patch for renaming
* feat: Webhook secret generation for Razorpay donations in Non-Profit Settings
* feat: Payment Entry for donations
- added Donor as Party Type
- setting for automating payment entries for donations created via web form
* fix: linter and sider issues
* fix: translation syntax
* feat: PAN Details custom field for Indian donors
* feat: 80G certificates for Donations with Print Format
* fix: sider
* feat: validations for donor and donation
- create donor for website user from donations
- validate donor email
* feat: extract member name from subscription notes
* test: Donation
* test: Tax Exemption 80G Certificate
* chore: styling fixes
* fix: tests
* fix: sider
* feat: extract PAN number from additional subscription notes
* feat: Add creation user field in Non Profit Settings
fix: Payment Entry not generating for memberships and donations
* feat: update desk page
* fix: tests
2021-03-11 13:19:44 +05:30
Marica
63eb6bdb3c
Merge pull request #24643 from CaseSolvedUK/sinvfix-v13
...
fix: Don't throw exception on invoice lines when there is no item_code
2021-03-11 10:47:24 +05:30
casesolved-co-uk
a780306ec7
fix: Don't throw exception on invoice lines when there is no item_code ( fixes #24640 )
2021-03-10 15:50:45 +00:00
Anupam Kumar
6f0fabc54e
fix: gle issue in internal transfer(Purchase) ( #24830 )
2021-03-10 18:36:46 +05:30
Ankush Menat
59fdee4dfa
Merge branch 'develop' into consolidated_report_acc_name_fix
2021-03-10 16:35:59 +05:30
Rucha Mahabal
c7fff34cf5
fix(travis): Customer Testcase Failing ( #24833 )
2021-03-10 15:51:44 +05:30
Ankush Menat
000fa824d3
fix: use account_name only in consolidated report
...
Don't use account_number and only rely on account_name for preparing
consolidated financial statement.
Related issue: ISS-20-21-10217
2021-03-10 15:23:48 +05:30
rohitwaghchaure
a0e7787f7b
fix: removed show cancelled entries checkbox from the stock ledger report ( #24826 )
2021-03-10 13:46:42 +05:30
Anupam Kumar
77eaf2939a
fix: rate of stock uom division by zero error ( #24829 )
2021-03-10 12:04:54 +05:30
Raffael Meyer
20cc2bb0d8
fix: autoname for Item Tax Template
...
* fix: autoname for Item Tax Template
Use title + company abbreviation instead of just title.
* fix: test records of Item Tax Template
* fix: rename item tax templates in test records
* Revert "fix: test records of Item Tax Template"
This reverts commit 53875c54ffe059c32d52b9ee60795d56f95473b1.
* fix: rename hardcoded item tax templates in tests
* fix: rename hardcoded Item Tax Templates in tests
(2)
* fix: delete Item Tax Template with company
2021-03-10 10:24:43 +05:30
Marica
6ccd64c2ec
Merge pull request #24464 from sgtpepper9907/feat-make-patient-age-translateable
...
feat: Make patient age translateable
2021-03-10 10:15:38 +05:30
Afshan
0623a34210
fix: added supplier warehouse field back again ( #24827 )
2021-03-10 09:46:38 +05:30
David Angulo
fe0f46c5b3
fix sider
2021-03-09 13:28:08 -06:00
David Angulo
06e99dfe7b
fix sider
2021-03-09 13:23:48 -06:00
David Angulo
358153b04b
fix sider
2021-03-09 13:19:12 -06:00
Francisco Roldán
894cff5aa4
fix: lms program and index missing context variables when is no data available ( #24828 )
...
* fix: program and index
* fix: moved default value to get_course_progress
2021-03-09 23:35:24 +05:30
Afshan
27bcb2a064
fix: renamed "supplier_warehouse" to "set_from_warehouse" ( #24816 )
...
* fix: reverting and adding new field for supplier warehouse
2021-03-09 22:25:48 +05:30
Anupam Kumar
832098f042
fix: In-Transit Feature enhancements ( #24652 )
2021-03-09 21:14:25 +05:30
Syed Mujeer Hashmi
ec829786e9
fix: Add student category to student applicant ( #24779 )
...
* fix: Add student category to student applicant
Student category will be automatically fetched during program
enrollment while importing students into the system.
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
* fix: Allow student category during program enrollment
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2021-03-09 21:04:55 +05:30
Rohan
db2d196296
fix: do not send emails to disabled users from Employee Onboarding ( #24795 )
2021-03-09 21:03:45 +05:30
Jannat Patel
d7ac2394e8
fix: error in bulk attendance ( #24806 )
...
* fix: error in bulk attendance
* fix: no date selected scenario
* fix: translation and sider
2021-03-09 20:41:58 +05:30
Sagar Vora
78777d6ed4
fix: fetch Material Requests of type Customer Provided in Stock Entry using Get Items From ( #24756 )
...
Co-authored-by: walstanb <walstanb@gmail.com>
2021-03-09 20:35:08 +05:30
Afshan
e314b8b209
fix: general ledger report ( #24770 )
2021-03-09 20:31:57 +05:30
Afshan
9f6015a4e9
fix: batch no in POS ( #24771 )
...
* fix: batch no in list
* fix: check for batch no to be list
2021-03-09 20:31:14 +05:30
Shariq Ansari
261c42186f
fix: updating phone icon setup logic for readonly fields ( #24787 )
...
* fix: updating phone icon setup logic for readonly fields
* fix: sider fix
2021-03-09 20:28:00 +05:30
Jannat Patel
fa73074250
fix: salary structure assign to employee ( #24798 )
...
* fix: salary structure assign to employee
* fix: pass data from dialog
2021-03-09 20:27:29 +05:30
Raffael Meyer
79b5be1830
fix: Group German VAT Accounts ( #24804 )
...
* fix: group account for tax assets and liabilities (germany)
* fix: spacing
2021-03-09 20:26:43 +05:30
Deepesh Garg
06a6ee37cb
fix: Ignore mandatory fields in opening invoice via Opening Invoice Creation tool ( #24821 )
2021-03-09 20:23:26 +05:30
Deepesh Garg
47c6d2e00f
Merge pull request #24814 from AfshanKhan/fix-tds-computation-summary
...
fix: sending proper arguments for TDS Computation Summary report
2021-03-09 20:01:30 +05:30
Deepesh Garg
6249798d84
Merge pull request #24801 from ankush/dont_update_pe_title
...
fix: do not update PE title during data import
2021-03-09 19:47:21 +05:30
Deepesh Garg
79005a4a76
Merge pull request #24820 from resilient-tech/fix-company-breadcrumbs
...
fix: breadcrumbs for company
2021-03-09 19:46:39 +05:30
Marica
e1ee9034ef
Merge branch 'develop' into item-attribute-fix
2021-03-09 18:35:44 +05:30
Marica
5accf8adf5
Merge branch 'develop' into salary_slip_error
2021-03-09 18:20:54 +05:30
Ankush Menat
9b4e5bfa87
chore: improve error message for missing fields.
2021-03-09 13:59:14 +05:30
Marica
5471265f92
Merge branch 'develop' into patch-6
2021-03-09 13:32:23 +05:30
walstanb
be98ee26cd
fix: breadcrumbs for company
2021-03-09 13:03:52 +05:30
Marica
baa406e99f
Merge pull request #24794 from alyf-de/set_value_instead_of_sql
...
fix: use set_value instead of sql
2021-03-09 11:54:31 +05:30
Afshan
d1fb363a37
Merge branch 'develop' into fix-tds-computation-summary
2021-03-08 22:50:04 +05:30
Afshan
d95b59e90c
fix: call function when arguments available
2021-03-08 18:19:53 +05:30
Ankush Menat
afc766bbf1
Merge branch 'develop' into dont_update_pe_title
2021-03-08 15:44:15 +05:30
Ankush Menat
5571b988dd
fix: make title field read only
2021-03-08 15:43:03 +05:30
Ankush Menat
cc46866cd9
fix: do not update PE title during data import
...
Related issue: ISS-20-21-10132
2021-03-08 15:42:39 +05:30
Afshan
1002e36c53
fix: removed unused import
2021-03-08 14:39:19 +05:30
