nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 11:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,844 Commits 464 Branches 1,752 Tags
e042ed69a11fbe764efbe380a453e59a5f0dc87a
Commit Graph

36844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
8975c5241e Merge pull request #25988 from rohitwaghchaure/donot-copy-difference-account 
fix: on click of duplicate button system has not copied the difference account
 2021-06-10 14:39:56 +05:30
Deepesh Garg
dad6a596eb Merge pull request #26002 from deepeshgarg007/update_staging_v2 
Update staging v2
 2021-06-10 13:29:28 +05:30
Deepesh Garg
bcbb1c68b4 fix: GL Entry ordering 2021-06-10 13:17:55 +05:30
Deepesh Garg
1e898c0f5b fix: Failing test case 2021-06-10 13:17:55 +05:30
Deepesh Garg
88c0cd6f7a fix: Add multiple fixes 2021-06-10 13:17:55 +05:30
Deepesh Garg
2924ff830e fix: Test case 2021-06-10 13:17:55 +05:30
Deepesh Garg
bc490e246e fix: Debug tests 2021-06-10 13:17:27 +05:30
Deepesh Garg
60de73b904 fix: Debug test 2021-06-10 13:17:27 +05:30
Deepesh Garg
af13348817 refactor: Advance taxes and charges calculation 2021-06-10 13:17:02 +05:30
Deepesh Garg
16b309e66e fix: Labeling and other fixes 2021-06-10 13:16:52 +05:30
Deepesh Garg
12fb02ed2a fix: Remove GL Entry from print 2021-06-10 13:16:51 +05:30
Deepesh Garg
223efec26e fix: Split GL Entry 2021-06-10 13:16:51 +05:30
Deepesh Garg
10e8316240 fix: Debug Test 2021-06-10 13:16:51 +05:30
Deepesh Garg
8106d70e70 fix: Update GL Entry ordering 2021-06-10 13:16:51 +05:30
Deepesh Garg
c368c5b20b fix: Create new supplier for test case 2021-06-10 13:16:51 +05:30
Deepesh Garg
b45d90153c fix: Add non group filter for account 2021-06-10 13:16:51 +05:30
Deepesh Garg
882913ca4e Merge pull request #26000 from GangaManoj/gst-settings-card 
fix: Only display GST card in Accounting Workspace if it's in India
 2021-06-10 12:46:15 +05:30
Deepesh Garg
d063f9a5d1 fix: GL Entry ordering 2021-06-10 12:26:21 +05:30
GangaManoj
076bd5eaab fix: Only display GST card in Accounting Workspace if it's in India 2021-06-10 12:08:44 +05:30
Deepesh Garg
701cba7f03 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount 2021-06-10 12:04:38 +05:30
Deepesh Garg
edecd5b0c6 fix: Update einvoice json test 2021-06-10 12:04:30 +05:30
Deepesh Garg
0b5fe1b5eb fix: Failing test case 2021-06-10 10:34:49 +05:30
Deepesh Garg
911818a9e2 fix: Add multiple fixes 2021-06-09 22:55:10 +05:30
Saqib
42557c4ad3 feat: cost-center wise period closing entry (#25766) 2021-06-09 19:48:31 +05:30
Saqib
26f0609390 feat: enable/disable gl entry posting for change given in pos (#25822) 2021-06-09 19:47:28 +05:30
Deepesh Garg
9e648183db fix: Test case 2021-06-09 18:26:16 +05:30
Deepesh Garg
7dabb6be30 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-09 18:10:55 +05:30
Deepesh Garg
b57ebba3fd fix: Validate negative allocated amount in Payment Entry (#25799) 2021-06-09 17:56:41 +05:30
Deepesh Garg
4c1dad8207 fix: Debug tests 2021-06-09 14:18:23 +05:30
Deepesh Garg
8090965162 fix: Debug test 2021-06-09 13:45:42 +05:30
Deepesh Garg
758db793be Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-09 13:39:07 +05:30
Deepesh Garg
bf5f87c2fe Merge pull request #25969 from deepeshgarg007/inernal_transfer_invoices_ignore 
fix: Ignore internal transfer invoices from GST Reports
 2021-06-09 13:32:52 +05:30
Deepesh Garg
be631d1caf Merge pull request #25986 from nextchamp-saqib/einvoicing-service-item-check 
fix(e-invoicing): service item check
 2021-06-09 13:00:43 +05:30
Anupam Kumar
21b8e2f0d8 fix: hiding Rounding Adjustment field (#25380) 
* fix: hiding Rounding Adjustment field

* fix: updating purchase_invoice.json
 2021-06-09 12:57:21 +05:30
Deepesh Garg
9a282aa593 Merge pull request #25858 from alyf-de/item-tax-templates 
feat: Item Tax Templates for Germany
 2021-06-09 12:50:27 +05:30
Rohit Waghchaure
99b583f688 fix: on click of duplicate button system copy the difference account from first row 2021-06-09 00:06:35 +05:30
Saqib Ansari
18eed58fc5 fix(e-invoicing): service item check 2021-06-08 20:52:14 +05:30
Rucha Mahabal
5ed2ef493a Merge pull request #25984 from pateljannat/quiz-fixes-v13 
fix: Quiz fixes v13
 2021-06-08 18:57:24 +05:30
pateljannat
7ace06ac21 fix: sider 2021-06-08 18:26:23 +05:30
Ganga Manoj
0ea4d850e1 fix: Allow all System Managers to delete company transactions (#25834) 2021-06-08 17:23:44 +05:30
pateljannat
bbf07d9214 fix: quiz timer issues 2021-06-08 17:05:44 +05:30
Deepesh Garg
e4fcc5562f refactor: Advance taxes and charges calculation 2021-06-08 16:35:47 +05:30
Sagar Vora
3f1231b77c Merge pull request #25981 from resilient-tech/ssa-selection-v13 
fix: choose correct Salary Structure Assignment when getting data for formula eval
 2021-06-08 15:21:10 +05:30
Sagar Vora
062e247353 test: remove unused imports 2021-06-08 14:43:28 +05:30
Sagar Vora
ca205be5ac fix: tests 2021-06-08 14:43:28 +05:30
Sagar Vora
0e5e1350b2 perf: use frappe.get_value with wildcard instead of another frappe.get_doc call 2021-06-08 14:43:28 +05:30
Sagar Vora
74818c7b62 fix: improve filter for from_date; validation for joining and relieving date 2021-06-08 14:43:28 +05:30
Sagar Vora
447c978757 fix: choose correct Salary Structure Assignment when getting data for formula eval 2021-06-08 14:43:28 +05:30
Anuja Pawar
d4398fd84a fix: update cost center from pos (#25971) 2021-06-07 16:20:21 +05:30
rohitwaghchaure
cf7baeab16 Merge pull request #25956 from rohitwaghchaure/fixed-conversion-factor-issue 
fix: custom conversion factor field not mapped from job card to stock entry
 2021-06-07 11:45:44 +05:30