CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-05 19:42:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,655 Commits 412 Branches 1,712 Tags
79005a4a76385cb1f0f6cbcd5154385378abe267
Commit Graph

34655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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