Sagar Vora
6727792aaf
test: fix syntax error
2021-03-11 18:12:01 +05:30
Sagar Vora
514122bf6f
refactor(payroll): simplified logic for additional salary
2021-03-11 17:22:11 +05:30
Nabin Hait
6e3668dc30
fix: merge conflict
2021-03-11 16:14:27 +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
Sagar Vora
5822b6d76f
fix(payroll): allow duplicate additional salaries
2021-03-10 21:45:32 +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
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
Afshan
fa932e2a3e
fix: sending proper arguments for report
2021-03-08 14:36:40 +05:30
Deepesh Garg
48b0f0da96
Merge pull request #24776 from ankush/gst_invoice_validation
...
fix: Add warning for invalid GST invoice numbers
2021-03-07 18:09:00 +05:30
Rohit Waghchaure
4c089b5852
minor fixes
2021-03-07 12:17:59 +05:30
Deepesh Garg
45870317f2
Merge pull request #24797 from UrvashiKishnani/patch-1
...
fix: total row in AR/AP summary report
2021-03-06 21:28:04 +05:30
Saqib
92b0691c68
fix: einvoice button visiblity condition ( #24800 )
2021-03-06 19:00:08 +05:30
Deepesh Garg
36a0085905
Merge pull request #24799 from danielchalmers/patch-8
...
fix: typo in Charts of Account doctype
2021-03-06 13:11:26 +05:30
Deepesh Garg
3e0a9383b4
Merge pull request #24789 from ankush/track_settings
...
fix: track setting changes
2021-03-06 13:09:58 +05:30
Daniel Chalmers
9b4a258c89
Chart Of Accounts -> Chart of Accounts
2021-03-04 00:15:46 -06:00
UrvashiKishnani
27ea23223d
fix: total row in AR/AP summary report
2021-03-04 09:21:25 +04:00
Raffael Meyer
f1d13a4ff3
Merge branch 'develop' into track_settings
2021-03-03 12:40:37 +01:00
barredterra
1521b31795
fix: use set_value instead of sql
2021-03-03 12:33:48 +01:00
barredterra
53d261702a
fix: make quick entry for Tax Category work
2021-03-03 11:52:48 +01:00
Ankush Menat
7c4c42ad67
refactor: move regex patterns to global variables
2021-03-03 14:56:19 +05:30
Ankush Menat
7c78220eac
Merge branch 'develop' into gst_invoice_validation
2021-03-03 13:38:14 +05:30
Ankush Menat
9b3f5d5f67
test: add tests for gst invoice name checks
2021-03-03 13:36:59 +05:30
Ankush Menat
a44df63a91
fix: Add warning for invalid GST invoice numbers
...
GST Invoice numbers should be 16 characters alphanumeric with dash(/) or
slash(-) only. Add check for doc.name before saving and warn about
naming series.
2021-03-03 11:26:12 +05:30
Deepesh Garg
82c6223196
Merge pull request #24745 from ankush/no_team_updates
...
fix(HR): hide "more" button from team updates
2021-03-02 18:55:34 +05:30
Deepesh Garg
ecde26409b
Update team_updates.js
2021-03-02 18:54:50 +05:30
Deepesh Garg
846500e8bc
Merge pull request #24751 from danielchalmers/patch-2
...
chore: Add description field & enable quick entry
2021-03-02 18:53:51 +05:30
Deepesh Garg
a5c4558f8b
feat: Additon of leave details in Salary Slip ( #24674 )
...
* feat: Additon of leave details in Salary Slip
* fix: Change leaves to leave
2021-03-02 18:36:48 +05:30
Deepesh Garg
7a5b6021b9
Merge pull request #24772 from anupamvs/si-timesheet
...
feat: provision to pull timesheet in sales invoice
2021-03-02 18:05:42 +05:30
Ankush Menat
7d892438f0
fix: track setting changes
2021-03-02 17:50:58 +05:30
Deepesh Garg
f06c166ee4
Merge pull request #24773 from UrvashiKishnani/patch-1
...
fix: GL Entries for AP/AR Summary
2021-03-02 17:49:13 +05:30
Jannat Patel
b27d4f6095
fix: salary slip working hours increment ( #24784 )
2021-03-02 17:44:42 +05:30
Nabin Hait
190106a8b8
fix: rounding of earned leave is optional ( #24782 )
2021-03-02 13:38:14 +05:30
Nabin Hait
bd10d7c028
fix: reposting patch fixes ( #24775 )
2021-03-02 13:37:45 +05:30
Anupam
47ce85484b
feat: provistion to pull timesheet in sales invoice
2021-03-02 11:31:26 +05:30
UrvashiKishnani
810a36105c
fix: GL Entries for AP/AR Summary without SQL join
...
SQL query modified to fetch only those GL Entries for Accounts Payable Summary and Accounts Receivable Summary reports where the corresponding payment entry is not in cancelled state.
2021-03-02 08:20:03 +04:00
Deepesh Garg
f45756d821
Merge pull request #24735 from FHenry/fix_create_item_tax_with_salespurchasetax
...
fix: add item taxes at the same times as sales and purchase taxes
2021-03-01 20:52:42 +05:30
Deepesh Garg
236a232de0
Merge pull request #24769 from rohitwaghchaure/allow-to-set-item-in-batch-naming
...
fix: allow to select item code in batch naming
2021-03-01 20:25:14 +05:30
Daniel Chalmers
2efdfa26b4
fix: Change FieldType from Text to Text Editor in Non-Conformance DocType ( #24760 )
...
* Enable Text Editors
Enable rich Text Editors for Corrective Action and Preventive Action fields. Closes #24759
* Update non_conformance.json
2021-03-01 15:44:16 +05:30
UrvashiKishnani
10e4b9d4e8
fix: GL Entries for AP/AR Summary
...
SQL query modified to fetch only those GL Entries for Accounts Payable Summary and Accounts Receivable Summary reports where the corresponding payment entry is in submitted state.
2021-03-01 12:50:07 +04:00
Rohit Waghchaure
eb6b3cfe6d
fix: allow to select item code in batch naming
2021-03-01 11:32:39 +05:30
Anuja Pawar
8755339cba
fix: to update sales person's incentives on save ( #24179 )
2021-03-01 10:44:13 +05:30
Saqib
fa777555b7
fix(india): inflated item tax rate for e-invoicing ( #24752 )
2021-02-28 20:46:23 +05:30
Deepesh Garg
d7a81be56d
Merge pull request #24742 from deepeshgarg007/project_filter_search_fields
...
fix: Add searchfields in project query
2021-02-27 18:20:56 +05:30
Deepesh Garg
6fdd859a10
Merge pull request #24700 from deepeshgarg007/rounding_issue_fix
...
fix: Issue on posting inter-warehouse transfer invoice
2021-02-27 17:30:01 +05:30
Deepesh Garg
b5819c74c8
Merge branch 'develop' of https://github.com/frappe/erpnext into project_filter_search_fields
2021-02-27 17:29:11 +05:30
Daniel Chalmers
28da945ecd
Update quality_meeting.json
2021-02-26 21:14:12 -06:00
Daniel Chalmers
56f6dbb666
Remove obsolete section titles
2021-02-26 21:11:56 -06:00
Daniel Chalmers
aa09628358
Skill fields: enable allow_in_quick_entry
2021-02-26 15:24:34 -06:00
rohitwaghchaure
630ce6e531
Merge pull request #24754 from rohitwaghchaure/fixed-repost-item-valuation-patch
...
fix: reposting patch
2021-02-26 23:58:29 +05:30
Rohit Waghchaure
c603fd638b
fix: reposting patch
2021-02-26 17:42:52 +05:30
Saqib
3dfa017f1d
refactor: (coa importer) create coa tree with account no & account name ( #23601 )
2021-02-26 16:50:22 +05:30
Saqib
2a1b1537f9
fix(pos): rounded total and search fixes ( #24738 )
2021-02-26 16:49:28 +05:30
Daniel Chalmers
9803835436
Add "description" field to Skill doctype
...
Lets us describe a skill past just the title. Closes #23592
2021-02-26 00:33:48 -06:00
Deepesh Garg
28ca4ec79d
Merge branch 'develop' into fix_create_item_tax_with_salespurchasetax
2021-02-26 10:43:15 +05:30
Deepesh Garg
27da2bb63a
fix: Remove unique check from represents company field
2021-02-25 22:39:47 +05:30
Ankush Menat
027db0b41e
fix(HR): hide "more" button from team updates
2021-02-25 21:29:00 +05:30
Deepesh Garg
b85fb0c3a4
Merge branch 'develop' into rounding_issue_fix
2021-02-25 20:17:35 +05:30
Ankush Menat
dca307e7cc
feat: track changes to HR settings ( #24739 )
...
related issue: FR-ISS-259927
2021-02-25 19:05:07 +05:30
Syed Mujeer Hashmi
286e00bdf2
fix: Fetch Task subject from Task ( #24729 )
2021-02-25 19:02:54 +05:30
Afshan
1be997beb4
fix: reference variable in pricing rule ( #24711 )
2021-02-25 19:01:32 +05:30
Deepesh Garg
2d0b277ce0
Merge pull request #24054 from gwhitney/other_app_acc_dims
...
feat(Accounting Dimension): accounting dimension doctypes for other apps
2021-02-25 18:48:42 +05:30
Anurag Mishra
02f50a93e5
fix: copy variants property and Attributes whil duplicatinh item Tamplate ( #24662 )
2021-02-25 18:47:17 +05:30
Anuja Pawar
118a4ffb08
fix: rounding error in finished goods qty ( #24653 )
2021-02-25 18:44:44 +05:30
Mohammad Hasnain Mohsin Rajan
8cdba8ab64
fix: ams integration breaks when error raised ( #24383 )
2021-02-25 18:36:19 +05:30
Deepesh Garg
6af3c3fa2a
Merge pull request #24722 from danielchalmers/patch-1
...
fix: Allow renaming skills
2021-02-25 15:44:44 +05:30
Deepesh Garg
7a837170ea
Merge branch 'develop' of https://github.com/frappe/erpnext into other_app_acc_dims
2021-02-25 15:41:03 +05:30
Deepesh Garg
b990e71b4c
fix: Add search field in project query
2021-02-25 14:01:22 +05:30
Deepesh Garg
834a8b740d
Merge branch 'develop' into subscription_fix_new
2021-02-25 11:24:27 +05:30
Ankush Menat
325a461c34
Merge branch 'develop' into opening_round_gl
2021-02-25 07:53:48 +05:30
Daniel Chalmers
d3e122259d
Update skill.json
2021-02-24 17:13:48 -06:00
Florian HENRY
e11ce57f3c
fix: add item taxes at the same times as sales and purchase taxes
2021-02-24 21:45:29 +01:00
Afshan
684fc4e27b
fix: asset category name disappear ( #24728 )
2021-02-24 19:08:56 +05:30
Afshan
6bd2bbc953
fix: show custom button for saved projects ( #24730 )
...
* fix: show custom button for saved projects
* fix: slider
2021-02-24 18:13:10 +05:30
rohitwaghchaure
d0baa90b50
Merge pull request #24715 from rohitwaghchaure/fixed-patch-item-reposting-develop
...
fix: patch failing because of incorrect gl entries
2021-02-24 17:18:43 +05:30
Afshan
84184559bc
fix: currency symbol in update items ( #24726 )
2021-02-24 16:51:11 +05:30
Shariq Ansari
1dba7d2161
fix: Added parent task expected end date validation ( #24611 )
...
* fix: Added parent task expected end date validation
* fix: implemented suggested code
* fix: updated test case
2021-02-24 12:39:23 +05:30
Rucha Mahabal
402fcbd489
Merge pull request #24716 from pateljannat/issue-custom-buttons
...
fix: custom buttons in issue
2021-02-24 11:47:29 +05:30
Ankush Menat
23c30e43f0
fix: make round off GLE always non-opening
...
Opening GL entries can not be for profit and loss accounts. Round off
accounts are by default P&L account. Hence when making opening entry,
make round off entries as non-opening.
Related issue: ISS-20-21-09677
2021-02-24 11:03:24 +05:30
Daniel Chalmers
c04ed62863
Allow renaming skills
2021-02-23 22:02:09 -06:00
Rohit Waghchaure
bc8c9de26d
fix: patch failing because of incorrect gl entries
2021-02-23 18:26:48 +05:30
Deepesh Garg
231aec9257
Merge pull request #24478 from nextchamp-saqib/tcs_calculation
...
feat: tax collected at source using tax withholding category
2021-02-23 18:04:38 +05:30
pateljannat
1e2772d389
fix: custom buttons in issue
2021-02-23 17:55:51 +05:30
Ankush Menat
d5656f4b76
fix(india): Escape json characters in text fields ( #24699 )
...
Escape all text fields and add helpful error message if JSON decode
error does happen.
2021-02-23 17:26:37 +05:30
Saqib Ansari
85c91ca2db
Merge branch 'develop' into tcs_calculation
2021-02-23 15:56:29 +05:30
Afshan
ae63d66b8f
fix: column names
2021-02-23 13:38:52 +05:30
Deepesh Garg
3dd0e49525
Merge pull request #24703 from deepeshgarg007/loan_test_precision_fix_new
...
fix: Precision fixes in loans
2021-02-23 11:22:52 +05:30
Deepesh Garg
8f8d9744f1
Merge pull request #24629 from deepeshgarg007/loan_dashboard
...
feat: Loans Dashboard
2021-02-23 11:22:32 +05:30
Deepesh Garg
b5a2320b33
fix: Precision fixes in loans
2021-02-22 23:04:48 +05:30
Nabin Hait
19f8fa59d3
fix: optimize reposting of sle and gle ( #24694 )
...
* fix: optimize update_gl_entries_after method
* fix: Optimized reposting patch
* fix: accounting dimensions
* added reload_doc in patch
* Update item_reposting_for_incorrect_sl_and_gl.py
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2021-02-22 22:27:22 +05:30
Mohammad Hasnain Mohsin Rajan
07f40596bc
feat(Bank Reconciliation): Redesign ( #24273 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-22 22:19:47 +05:30
Nabin Hait
866cf70d3a
fix: validate pan
2021-02-22 21:35:00 +05:30
shariquerik
f5d6bd77e5
fix: item attributes not editable until refresh
2021-02-22 21:27:14 +05:30
Deepesh Garg
c839177f8e
fix: Issue on posting inter-warehouse transfer invoice
2021-02-22 21:04:51 +05:30
Marica
214951a9c6
Merge pull request #24631 from AfshanKhan/fix-valuation-errror-customer-provided
...
fix: check if customer provided item while setting opening stock
2021-02-22 20:10:27 +05:30
Nabin Hait
69a6bed106
fix: Replaced spaces with tabs
2021-02-22 20:03:23 +05:30
Shridhar Patil
58399f6524
fix: next follow up date should be always greater then current time ( #24308 )
2021-02-22 19:37:38 +05:30
Nabin Hait
0ca74ce04b
fix: Fixes related to client script renaming ( #24698 )
2021-02-22 19:32:51 +05:30
Ankush Menat
98a0feab89
fix(india): escape for special characters in JSON ( #24695 )
...
JSON does not accept special whitespace characters like tab, carriage
return, line feed
Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf
Related issue: ISS-20-21-09811
2021-02-22 19:30:02 +05:30
Deepesh Garg
bb8cd1cdaa
feat: Basic validation for indian PAN No. in Supplier ( #24687 )
2021-02-22 19:28:45 +05:30
Shariq Ansari
8676bedd18
fix: Add phone icon on read only phone fields ( #24680 )
...
* fix: Add phone icon on read only phone fields
* fix: sider fix
2021-02-22 19:28:01 +05:30
Saqib
14472f6bab
fix(regional): vehicle no is mandatory for ewaybill generation ( #24679 )
...
* fix: vehicle no required for e-invoice
* fix: ewaybill generation dialog condition
2021-02-22 19:27:23 +05:30
Afshan
fdafb55fba
fix: error message when making reverse journal entry ( #24665 )
2021-02-22 19:25:57 +05:30
Marica
28c834ac95
Merge branch 'develop' into fix-valuation-errror-customer-provided
2021-02-22 16:00:28 +05:30
rohitwaghchaure
311bb6452f
Merge pull request #24691 from deepeshgarg007/accounting_dimension_timeout
...
fix: Accounting Dimension creation background job timeout
2021-02-22 15:29:41 +05:30
Deepesh Garg
d780f56ba8
Revert "fix: Error handling in loan reports and precision fixes"
2021-02-22 15:12:35 +05:30
Afshan
133ebc1d51
Merge branch 'develop' into fix-valuation-errror-customer-provided
2021-02-22 14:16:33 +05:30
Marica
4a1ffcf742
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-22 11:34:34 +05:30
Afshan
01b4ee8a3c
Merge branch 'develop' into fix-valuation-errror-customer-provided
2021-02-22 11:17:45 +05:30
Deepesh Garg
aa46def745
fix: Accounting Dimension creation background job timeout
2021-02-21 21:54:23 +05:30
Deepesh Garg
e4964a0c6c
fix: Update color in charts
2021-02-21 21:03:42 +05:30
Deepesh Garg
e53fd87669
fix: Rearrange cards
2021-02-21 20:57:56 +05:30
Deepesh Garg
cbb4fe2cce
fix: Add cards
2021-02-21 20:57:30 +05:30
Deepesh Garg
a6d0610730
Merge pull request #24505 from deepeshgarg007/loan_exposure_report_fix
...
fix: Error handling in loan reports and precision fixes
2021-02-20 17:57:09 +05:30
Deepesh Garg
e12398e75e
Merge pull request #24682 from frappe/michellealva-leave
...
fix: typo in Leave Balance Report
2021-02-20 17:53:04 +05:30
Deepesh Garg
75b01e3d72
Merge pull request #24683 from frappe/michellealva-patch-1
...
fix: Typo in Leave Application
2021-02-20 17:52:38 +05:30
Deepesh Garg
bbadebcf64
Merge branch 'develop' into loan_exposure_report_fix
2021-02-20 17:32:17 +05:30
Deepesh Garg
6f29f67a83
Merge pull request #24667 from pateljannat/gstr-1-unidentified-accounts-issue
...
fix: excluding unidentified accounts from gstr-1
2021-02-20 17:27:56 +05:30
Michelle Alva
43f126ed13
fix: Typo in Leave Application
...
Change "Leaves" to "Leave"
2021-02-20 10:46:22 +05:30
Michelle Alva
ab149f196e
fix: typo in Leave Balance Report
...
Change Leaves to Leave
2021-02-20 10:43:47 +05:30
rohitwaghchaure
1aad27a539
Merge pull request #24612 from rohitwaghchaure/fixed-validation-for-job-card
...
fix: [minor] validation of job card in stock entry
2021-02-19 21:22:57 +05:30
Saqib Ansari
8c7c682f17
chore: make parameter group optional
2021-02-19 20:35:23 +05:30
Deepesh Garg
6a5ef261f2
feat: Normal rounding for GST Taxes ( #24488 )
...
* feat: Normal rounding for GST Taxes
* fix: Add test case
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-19 14:30:23 +05:30
Deepesh Garg
811ff5c397
Merge pull request #24669 from deepeshgarg007/transaction_delete_fix
...
fix: Do not delete GST Accounts from GST Settings on clearing transactions from Company Master
2021-02-19 10:54:56 +05:30
Deepesh Garg
7efbbcf3aa
fix: Do not delete GST Accounts from GST Settings on clearing transactions from Company Master
2021-02-19 10:53:58 +05:30
Deepesh Garg
bc857522ad
fix: Loan Interest Accrual Chart
2021-02-19 10:13:56 +05:30
pateljannat
4858b40813
fix: excluding unidentified accounts from gstr-1
2021-02-18 18:44:29 +05:30
Marica
77d72d59ef
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-18 16:55:44 +05:30
Marica
f3ca4bcb70
Merge branch 'develop' into rfq-contact-email-set
2021-02-18 16:51:50 +05:30
Rucha Mahabal
ccc80927f6
feat: Department Wise Appointment Type charges ( #24572 )
...
* feat: Appointment Type Service Items
Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com>
* fix: set practitioner service item charges mandatory on item selection
Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com>
* feat: use charges from appointment type during billing
* feat: handle appointment charges priority for invoice automation
* test: patient appointment auto invoicing scenarios
* fix: sider
* fix: minor fixes
Co-authored-by: muhammad <muhammadmp@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-18 16:41:10 +05:30
Raffael Meyer
d44e60f17c
feat: add Print Language to Lead and Opportunity ( #24317 )
...
* fix: move "Print Language" to "More Information"
* feat: add "Print Language" in "More Information"
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-02-18 16:24:37 +05:30
Rucha Mahabal
e7bf87cc84
fix: POS return for Serialized Items ( #24292 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-02-18 16:04:35 +05:30
Jannat Patel
ef5c714de2
fix: salary slip attribute error ( #24455 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-02-18 15:52:29 +05:30
Rohit Waghchaure
c697cb8b2d
fix: validation of job card in stock entry
2021-02-18 15:10:12 +05:30
Nabin Hait
d826bee13a
fix: update qty in future sle ( #24649 )
...
* fix: update qty in future sle
* fix: validate cancellation due to ongoing reposting
* fix: process sle against current timestamp
2021-02-18 14:14:21 +05:30
Anurag Mishra
5ec592d09c
fix: supplier was not able to Submit RFQ due to in sufficient permission
2021-02-18 13:42:04 +05:30
Deepesh Garg
c5b94adc87
Merge pull request #24651 from ankush/ignore_gl_while_cancelling_so
...
fix(selling): cancel sales order with cancelled PE
2021-02-17 18:39:35 +05:30
rohitwaghchaure
03a1484aed
Merge pull request #24621 from rohitwaghchaure/fixed-consolidated-report-not-working-develop
...
fix: Consolidated Financial Statement report not works if child compa…
2021-02-17 16:35:43 +05:30
Marica
208d1942c3
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-17 12:56:35 +05:30
Marica
7de7bb5202
Merge branch 'develop' into item_group_on_update_items
2021-02-16 23:06:20 +05:30
Marica
4441cebbb3
Merge branch 'develop' into shopping-cart
2021-02-16 20:55:00 +05:30
Ankush Menat
3f16902b00
fix(selling): cancel sales order with cancelled PE
...
Allow cancelling sales order with cancelled payment entry. Ignoring GL
entries while cancelling the document is required to cancel it, reverse
entries are created by accounts controller.
Related issue: ISS-20-21-09586
2021-02-16 18:53:40 +05:30
Ankush Menat
f9d4d9a095
test(selling): add test for cancelling sales order
...
Add failing test to reproduce bug in cancelling sales order with advance
payments
Related issue: ISS-20-21-09586
2021-02-16 18:45:39 +05:30
prssanna
9c36dc3798
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2021-02-16 16:17:32 +05:30
prssanna
7166b6740f
fix: duplicate css property
2021-02-16 16:17:17 +05:30
Nabin Hait
9b178bcd10
fix: stock and account balance syncing ( #24644 )
...
* fix: stock and account balance syncing
* fix: stock and account balance syncing
* fix: stock and account balance syncing
* fix: minor fix
2021-02-16 14:57:00 +05:30
prssanna
7e8113c7e8
fix: broken image style
2021-02-16 12:00:35 +05:30
Rohit Waghchaure
9a40c1b2e1
fix: patch
2021-02-16 10:35:10 +05:30
rohitwaghchaure
d60ff83b6f
fix: added patch to fix incorrect stock qty and account value ( #24628 )
2021-02-16 09:12:27 +05:30
Deepesh Garg
79f63526cb
Merge pull request #24632 from ankush/ladakh_gst_addition
...
fix(India): Add GST state code for Ladakh
2021-02-15 21:11:54 +05:30
Deepesh Garg
e2324c77fe
fix: Test Cases
2021-02-15 20:01:32 +05:30
Nabin Hait
243661b37b
fix: formatting query args ( #24627 )
2021-02-15 19:27:49 +05:30
Rushabh Mehta
8cc6a2d62c
fix(typo): erpnext-logo.png
2021-02-15 17:40:50 +05:30
Rushabh Mehta
b0735732f9
fix(minor): add erpnext-logo.png
2021-02-15 17:38:55 +05:30
Deepesh Garg
df4eed4c0d
Merge pull request #24615 from ruchamahabal/packed-item-fixes_v13
...
fix: Issues with packing items
2021-02-15 16:44:10 +05:30
Deepesh Garg
47f5f4757a
Merge branch 'develop' into fixed-consolidated-report-not-working-develop
2021-02-15 16:35:31 +05:30
Deepesh Garg
b6cd97e5fc
Merge pull request #24320 from pateljannat/ldc-validations
...
fix: validation for ldc against supplier and section code
2021-02-15 16:33:41 +05:30
Deepesh Garg
535dc4aea2
fix: Do not round off per day interest
2021-02-15 15:54:25 +05:30
Ankush Menat
57c3d373a7
fix(India): Add GST state code for Ladakh
2021-02-15 15:03:50 +05:30
Afshan
e963362dfd
fix: check if customer provided item while setting opening stock
2021-02-15 15:00:37 +05:30
Deepesh Garg
429fb3bba8
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_exposure_report_fix
2021-02-15 14:10:10 +05:30
Deepesh Garg
9bf05ad927
feat: Loans Dashboard
2021-02-15 13:32:50 +05:30
Richard Case
fd4e7bdbb1
fix: plaid client version to support latest API ( #24531 )
2021-02-15 11:58:27 +05:30
Marica
45db1c5d74
Merge branch 'develop' into shopping-cart
2021-02-15 10:35:05 +05:30
rohitwaghchaure
164ffac4ef
fix: Consolidated Financial Statement report not works if child company account not present in parent company ( #24580 )
...
Fixed conflicts
2021-02-12 17:33:07 +05:30
Nabin Hait
85252e7aef
Merge branch 'develop' into packed-item-fixes_v13
2021-02-12 12:39:38 +05:30
Afshan
c44d6b9546
fix: NoneType object has no attribute len() ( #24616 )
2021-02-12 12:24:41 +05:30
Marica
87fcae4efd
Merge branch 'develop' into shopping-cart
2021-02-12 12:16:13 +05:30
Rucha Mahabal
ad1f2b41f4
fix: Issues with packing items
2021-02-12 11:29:24 +05:30
Saqib Ansari
138e98fef2
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-12 11:19:25 +05:30
Nabin Hait
1e6cce3593
Merge branch 'develop' into item_group_on_update_items
2021-02-11 21:59:38 +05:30
Jannat Patel
bb0d8f8038
Update accounts_controller.py
2021-02-11 20:59:28 +05:30
Anupam Kumar
7e1dcf911d
feat: capture Rate of stock UOM in purchase ( #24315 )
...
* feat: capture Rate of stock UOM in purchase
* fix: review changes
* added server side code
* added stock uom rate in sales transactions
* fix: review changes
* fix: resolving conflicts
* adding patch
* fix: removing patch
2021-02-11 20:19:30 +05:30
Afshan
ee87484134
fix: calculated discount percentage ( #24510 )
...
* fix: calculated discount percentage
* fix: slider
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-11 20:11:58 +05:30
Jannat Patel
0a7939277c
fix: dynamic links for reports ( #24462 )
...
* fix: dynamic links for reports
* fix: revert changes for payment period report
* fix: link doctypes
2021-02-11 20:11:06 +05:30
marination
e2d0715cdf
fix: Server side validation for missing payment gateway account
2021-02-11 19:06:10 +05:30
marination
8615227090
fix: Shopping cart breaks without Payment Gateway Account
2021-02-11 18:51:35 +05:30
Saqib
f25ab6f826
fix: validate cancellation only if irn generated ( #24608 )
2021-02-11 17:50:57 +05:30
Jannat Patel
6756d3b561
Merge branch 'develop' into item_group_on_update_items
2021-02-11 16:29:34 +05:30
Marica
819b8d0266
Merge branch 'develop' into rfq-contact-email-set
2021-02-11 14:45:09 +05:30
Saqib
0681a480c2
feat(pos): mpesa related fixes & additions ( #24306 )
...
* fix: switching of mode of payments
* feat: transaction limit for mpesa integration
* feat: resend payment request if one fails
* feat: make new request only for failed ones
* fix: invalid amount for mpesa request
* fix: payment successful message not shown
* fix: url and business shortcode for live env
* fix: duplicate items validation for pos invoices
* fix: pos closing entry queued status
* fix: peroid end date for amended pos closing
2021-02-11 14:06:15 +05:30
Shariq Ansari
a46a83b476
fix: Assignment Rule Unassign Condition doesn't work ( #24551 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-11 13:41:10 +05:30
Nabin Hait
aa235b36e0
Update erpnext/controllers/accounts_controller.py
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-02-11 13:26:53 +05:30
Marica
a5039e8f85
Merge branch 'develop' into rfq-contact-email-set
2021-02-11 13:23:56 +05:30
Shariq Ansari
47f784aa9c
fix: Lead not getting linked to call logs ( #24593 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-11 13:23:51 +05:30
rohitwaghchaure
aa00eb9898
fix: reposting issue with same posting date and posting time ( #24570 )
...
* fix: reposting issue with same posting date and posting time
* Update erpnext/stock/stock_ledger.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-11 13:23:01 +05:30
Saqib
e37a5c2646
fix: customer_currency referenced before assignment ( #24607 )
2021-02-11 13:10:52 +05:30
Saqib
e07eb86498
Merge branch 'develop' into tcs_calculation
2021-02-11 12:13:47 +05:30
Saqib
15f4672ffa
fix: pos closing valdation ( #24605 )
2021-02-11 12:11:44 +05:30
Jannat Patel
30c8873f24
fix: validation for disabled warehouse ( #24539 )
...
* fix: validation for disabled warehouse
* fix: better function name
* fix: validation in stock ledger entry
2021-02-11 11:46:48 +05:30
Kanchan Chauhan
bb05acb60d
fix(Leave Application): List view fix ( #24550 )
2021-02-11 11:18:59 +05:30
Nabin Hait
9d3f242f39
Update subscription.js
2021-02-11 11:17:33 +05:30
Nabin Hait
b58b8ec2fb
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-11 11:14:02 +05:30
Anupam Kumar
e816ed89e6
fix: portal permission issue ( #24577 )
2021-02-11 11:12:13 +05:30
Anuja Pawar
e3c72a3d71
fix: fix filters for the report ( #24594 )
2021-02-11 11:06:12 +05:30
Afshan
8609d31430
fix: amend cancelled job offer ( #24589 )
2021-02-11 11:05:48 +05:30
Ankush Menat
df6e20887d
fix: update total in words after updating items ( #24602 )
...
* fix: Update total in words after Updating items
Update total in words after Updating items in sales/purchase orders.
Port of #24592
Closes ISS-20-21-09425
* test: Add test for total & words after update item
Add test for total & words after updating items in sales order.
2021-02-11 11:04:39 +05:30
Nabin Hait
79ba299abc
Merge branch 'develop' into subscription_fix_new
2021-02-11 11:03:45 +05:30
Suraj Shetty
969d37da4c
Merge pull request #24598 from surajshetty3416/fix-favicon
2021-02-10 22:18:10 +05:30
Saqib
7b2afaf349
fix: NoneType has no len() ( #24600 )
2021-02-10 17:21:12 +05:30
Prssanna Desai
161e3954a8
Merge branch 'develop' into fix-favicon
2021-02-10 16:37:13 +05:30
Rucha Mahabal
3237f5bb88
fix: Inpatient Medication Orders report test ( #24596 )
2021-02-10 16:36:49 +05:30
prssanna
fd0e8a4e23
fix: also fetch item variants if hide variants is disabled
2021-02-10 16:31:41 +05:30
Suraj Shetty
5f27c9e100
chore: Remove unnecessary image files
2021-02-10 15:48:58 +05:30
Suraj Shetty
6fa44fefc3
fix: Use new favicon
2021-02-10 15:48:32 +05:30
Marica
bb87950e96
Merge branch 'develop' into rfq-contact-email-set
2021-02-10 12:02:14 +05:30
pateljannat
1ab95413be
fix: conditions simplified
2021-02-09 17:35:17 +05:30
Deepesh Garg
516b3ae1bc
fix: get company attribute
2021-02-09 16:47:55 +05:30
Deepesh Garg
45cec6928b
fix: get company attribute
2021-02-09 16:44:12 +05:30
Deepesh Garg
5006a2065e
fix: Comment
2021-02-09 16:38:11 +05:30
Anurag Mishra
5164223b99
fix: error on group by filter ( #24587 )
...
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-02-09 16:22:28 +05:30
