CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-21 11:15:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,924 Commits 424 Branches 1,724 Tags
60ea785dfd434f67112e785b8a4bcb4e7705ee03
Commit Graph

35924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Rohit Waghchaure
535406cb0c fix: allow to select item code in batch naming 2021-03-09 21:01:12 +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
dfc5c45e50 Merge pull request #24701 from shariquerik/item-attribute-fix 
fix: item attributes not editable until refresh
 2021-03-09 18:44:59 +05:30
Marica
e1ee9034ef Merge branch 'develop' into item-attribute-fix 2021-03-09 18:35:44 +05:30
Marica
916b75a3a3 Merge pull request #24768 from ankush/salary_slip_error 
chore: improve error message for missing fields.
 2021-03-09 18:23:09 +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
9d0a93dd92 Merge pull request #24761 from danielchalmers/patch-6 
fix: Remove obsolete section titles from Quality Meeting doctype
 2021-03-09 13:36:38 +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
barredterra
99c8b8efcf Merge branch 'develop' into improve_taxes_setup 2021-03-08 20:00:59 +01:00
barredterra
ebd1d08e55 refactor: taxes setup 
Better structure of input data.
 2021-03-08 19:53:50 +01:00
Afshan
d1fb363a37 Merge branch 'develop' into fix-tds-computation-summary 2021-03-08 22:50:04 +05:30
Deepesh Garg
98cc7b1751 Merge pull request #24817 from AfshanKhan/fix-get_round_off_applicable_accounts-arguments 
fix: call get_round_off_applicable_accounts() function when arguments available
 2021-03-08 22:20:25 +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
rohitwaghchaure
15c0199e07 Merge pull request #24811 from rohitwaghchaure/minor-fixes-for-work-order 
fix: minor changes in work order
 2021-03-07 12:53:29 +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
Deepesh Garg
9cbdfe17e4 Merge pull request #24793 from alyf-de/tax_category_quick_entry 
fix: make quick entry for Tax Category work
 2021-03-06 13:04:58 +05:30
Saurabh
202ef92fa1 Merge branch 'version-13-beta-pre-release' into version-13-beta v13.0.0-beta.13 2021-03-05 09:34:01 +05:30
Saurabh
4e1206bf21 bumped to version 13.0.0-beta.13 2021-03-05 09:54:01 +05:50
barredterra
25afad3dc1 refactor: extend taxes and charges setup 
Add option to specify taxes and charges template depending on the CoA used. Differentiate between purchase, sales and item taxes. Maintain flexibility by using wildcards.
 2021-03-04 21:11:31 +01:00