Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,643 Commits 3 Branches 0 Tags 1 GiB
6a07869e55
Commit Graph

36643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marica
326a2e6a99
Merge pull request #26020 from marination/subcontracted-rm-to-transfer-report-develop 
fix: Report Subcontracted Raw Materials to be Transferred
 2021-06-14 17:11:51 +05:30
Marica
ff1360a8e6
Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop 2021-06-14 16:48:57 +05:30
marination
5d082b05a9 fix: Flaky test for Report Subcontracted Raw materials to be transferred 2021-06-14 16:31:45 +05:30
Nabin Hait
580b4d50b5
Merge pull request #26027 from ruchamahabal/add-inactive-status-to-employee 
feat: add Inactive status to Employee
 2021-06-14 12:34:33 +05:30
Nabin Hait
c8ed863454
Merge pull request #26029 from ruchamahabal/add-inactive-status-to-employee-v13-release 
feat: add Inactive status to Employee
 2021-06-14 12:32:28 +05:30
Suraj Shetty
d1902dfadb Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing 2021-06-14 12:25:49 +05:30
Marica
d37912fff1
Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop 2021-06-12 16:00:14 +05:30
Rucha Mahabal
0ed33aa4e8
fix: unable to enter score in Assessment Result details grid (#25945) 2021-06-12 13:40:58 +05:30
Rucha Mahabal
efd7d584b2 feat: add Inactive status to Employee 2021-06-12 13:34:20 +05:30
Rucha Mahabal
a38147a8ba feat: add Inactive status to Employee 2021-06-12 13:33:21 +05:30
Ankush Menat
348f04ca82
fix: syntax error in serial/batch selector (#26024) 2021-06-11 21:01:30 +05:30
Ankush Menat
9891780f5a
perf(minor): remove unnecessary comprehensions (port #25645) 2021-06-11 18:40:22 +05:30
Marica
19d36be624
Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop 2021-06-11 17:50:43 +05:30
marination
ea3e61d3b0 fix: Test 2021-06-11 17:29:55 +05:30
Ankush Menat
a424c0c023
test(perf): eliminate repeat creation of HSN codes (bp #25947) 2021-06-11 16:49:39 +05:30
marination
a4ed6a3519 fix: Sider 2021-06-11 12:51:36 +05:30
marination
c5da51dd7a fix: Report Raw Materials to be Transferred 2021-06-11 12:51:10 +05:30
rohitwaghchaure
387de3f3fa
Merge pull request #26015 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation-develop 
fix: timeout error in the repost item valuation
 2021-06-11 12:18:13 +05:30
rohitwaghchaure
da28db3698
Merge pull request #26016 from rohitwaghchaure/fixed-conversion-factor-issue-develop 
fix: custom conversion factor field not mapped from job card to stock entry
 2021-06-11 12:17:54 +05:30
rohitwaghchaure
49f3e5bbd5
Merge pull request #26017 from rohitwaghchaure/donot-copy-difference-account-develop 
fix: on click of duplicate button system has not copied the difference account
 2021-06-11 12:17:36 +05:30
rohitwaghchaure
eac07a28e3
Merge pull request #26014 from rohitwaghchaure/fixed-filters-for-item-query-develop 
fix: filter type for item query
 2021-06-11 12:17:14 +05:30
Rohit Waghchaure
17408c6388 fix: on click of duplicate button system copy the difference account from first row 2021-06-11 10:58:00 +05:30
Rohit Waghchaure
9cfd3adad9 fix: custom conversion factor field not mapped from job card to stock entry 2021-06-11 10:56:44 +05:30
Rohit Waghchaure
b103b24ae1 fix: timeout error in the repost item valuation 2021-06-11 10:55:05 +05:30
Rohit Waghchaure
f310501d7d fix: filter type for item query 2021-06-11 10:53:07 +05:30
gavin
04df567973
Merge pull request #25967 from anupamvs/payroll-emp-detail 
fix: payroll entry employee detail issue
 2021-06-10 20:37:35 +05:30
Nabin Hait
42d72b55b8 Merge branch 'version-13-hotfix' into version-13-pre-release 2021-06-10 20:26:31 +05:30
Nabin Hait
d17217c4e2
Merge pull request #25831 from deepeshgarg007/tds_advance_payment_v13 
feat: Tax deduction against advance payments
 2021-06-10 20:25:30 +05:30
gavin
46cc089f8b
Merge branch 'develop' into payroll-emp-detail 2021-06-10 20:15:28 +05:30
Nabin Hait
27299cfcc5 Merge branch 'version-13-hotfix' into version-13-pre-release 2021-06-10 19:45:38 +05:30
Nabin Hait
002ec69b2f
Merge pull request #25961 from deepeshgarg007/dynamic_gst_rates 
feat: Item Taxes based on net rate
 2021-06-10 19:39:48 +05:30
Anupam
32ebb1001e fix: review chnages 2021-06-10 19:32:00 +05:30
Deepesh Garg
48f2839079 fix: Sort account balances by account name 2021-06-10 19:00:50 +05:30
Deepesh Garg
3b34fc4cce Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-10 18:57:31 +05:30
Deepesh Garg
5434dd048b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into dynamic_gst_rates 2021-06-10 18:56:39 +05:30
Deepesh Garg
0d49b6c211
Merge pull request #26004 from gavindsouza/patch-tests-v13 
ci: Update Patch tests (backport)
 2021-06-10 18:52:27 +05:30
Saqib
9a67141bfb
fix(einvoicing): service item check (#26010) 2021-06-10 18:48:55 +05:30
Deepesh Garg
d52539798c
Merge pull request #26009 from deepeshgarg007/account_balance_test 
fix: Sort account balances by account name
 2021-06-10 18:47:43 +05:30
Deepesh Garg
9a243ed469 fix: Sort account balances by account name 2021-06-10 18:16:46 +05:30
Deepesh Garg
a5c3427293 fix: Sort account balances by account name 2021-06-10 18:09:49 +05:30
Sagar Vora
ba333927f8
Merge pull request #26005 from resilient-tech/fix-se 
fix: syntax error in Stock Entry
 2021-06-10 16:54:11 +05:30
walstanb
8f5ae0470d fix: syntax error in stock entry 2021-06-10 16:35:27 +05:30
Gavin D'souza
137d08a9d7 fix: Manually link_fields from flags before rename_doc 2021-06-10 15:09:17 +05:30
Gavin D'souza
96f8ebc308 fix(patch): Handle NULL values from fieldtype change 2021-06-10 15:08:55 +05:30
Gavin D'souza
43a24f2aa8 ci: Update ERPNext backup patch test >= v10 
* Generated v10 backup archive
    * used old v7 erpnext backup hosted via build.erpnext.com
    * upgraded to v10 frappe + erpnext
* Hosted backup on https://erpnext.com/files/v10-erpnext.sql.gz
 2021-06-10 15:08:42 +05:30
Gavin D'souza
3dfbfe87e9 chore: Drop < v10 patches from list 
v7 backup was restored and upgraded to latest v10.x.x branch. The patches run uptil the upgrade are removed in this change. This means only existing v10 sites are allowed direct upgrade to v13 and newer

There are older version patches still left since they're being used in later ERPNext versions too.
 2021-06-10 15:07:56 +05:30
Gavin D'souza
aedf25ba46 chore: Drop old patches 
v7 backup was restored and upgraded to latest v10.x.x branch. The
patches run uptil the upgrade are removed in this change. This means
only existing v10 sites are allowed direct upgrade to v13 and newer
 2021-06-10 15:07:39 +05:30
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
rohitwaghchaure
64cc60f97a
Merge pull request #25946 from gavindsouza/patch-tests 
ci: Update Patch tests
 2021-06-10 14:11:08 +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