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

36938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
8c844e4515 fix: material request and supplier quotation not linked if sq created from supplier portal against rfq 2021-06-19 16:08:26 +05:30
Dany Robert
ba288274f2
fix: ignore permission to update call log 2021-06-19 12:31:12 +05:30
Rohit Waghchaure
8520edc952 fix: time out while submitting the stock transactions with more than 50 items 2021-06-19 00:55:35 +05:30
Deepesh Garg
52992b345f
Merge pull request #26106 from deepeshgarg007/loan_repay_via_salary 
fix: Sanctioned loan amount limit check
 2021-06-18 23:30:54 +05:30
Deepesh Garg
be881c743e
Merge pull request #26108 from deepeshgarg007/loan_repay_via_salary_v13 
fix: Sanctioned loan amount limit check
 2021-06-18 23:30:29 +05:30
Deepesh Garg
81c97c13ce fix: Sanctioned loan amount limit check 2021-06-18 19:57:53 +05:30
Deepesh Garg
22e75725ea fix: Sanctioned loan amount limit check 2021-06-18 17:25:37 +05:30
Anurag Mishra
ef6e005c04
Merge pull request #26071 from Anurag810/training_event_fixes_2.0 
fix: Training event
 2021-06-18 15:44:56 +05:30
Ankush
4e88dcf956
fix: auto unlink warehouse from item on delete (#26073) (#26101) 
* fix: auto unlink warehouse from item on delete

* fix: sider

* refactor: use delete_doc

* test: add test for unlinking warehouse from item

* refactor: add msgprint to inform user of unlink

* refactor: cleanup and reuse extant functions

* fix: don't delete row, update table

Co-authored-by: Alan <2.alan.tom@gmail.com>
 2021-06-18 14:48:30 +05:30
Ankush
584fe32900
fix: escaped warehouse value for sql query (bp #26049) 
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-06-18 14:47:30 +05:30
Ganga Manoj
3d8f82459b
fix(Issue): reset response_by and resolution_by if SLA is removed (#25997) 2021-06-18 11:42:28 +05:30
rohitwaghchaure
e43df63978
Merge pull request #26099 from rohitwaghchaure/enqueue-cancel-action-in-stock-reco-develop 
fix: timeout while cancelling stock reconciliation
 2021-06-18 11:31:00 +05:30
Anuja Pawar
b066fe9519
fix: insufficient permission for dunning error (#26092) 2021-06-18 11:29:07 +05:30
Saqib
5633834ef7
Merge branch 'develop' into export-round-off-fix 2021-06-18 11:25:21 +05:30
Saqib
cceabff6e1
Merge branch 'develop' into pr-item-gl-fix 2021-06-18 11:24:54 +05:30
Rohit Waghchaure
7fc50ba460 fix: timeout while cancelling stock reconciliation 2021-06-18 10:45:53 +05:30
Deepesh Garg
a58b571ccb fix: Billing address not fetched in Purchase Invoice 2021-06-18 10:45:35 +05:30
rohitwaghchaure
3bb9f4a742
Merge pull request #26098 from rohitwaghchaure/enqueue-cancel-action-in-stock-reco 
fix: timeout while cancelling stock reconciliation
 2021-06-18 10:44:59 +05:30
Rohit Waghchaure
ef97269386 fix: timeout while cancelling stock reconciliation 2021-06-18 10:11:53 +05:30
Suraj Shetty
6894cc2832
Merge pull request #26088 from surajshetty3416/refactor-website-routing 2021-06-17 20:43:23 +05:30
Suraj Shetty
e8e4841e5e ci: Build frappe assets 
- Build frappe assets since it is used for print views
 2021-06-17 20:23:18 +05:30
Deepesh Garg
59e2e4989b fix: Incorrect billed qty in Sales Order analytics 2021-06-17 19:58:16 +05:30
Eben van Deventer
ddef85ae97
fix: Correct South Africa VAT Rate (#25894) 
On 1 April 2018 South Africa increased the VAT rate from 14% to 15%, this proposed change seeks to update the default parameters for a fresh ERPNext installation.
 2021-06-17 18:43:30 +05:30
Deepesh Garg
1c1e25da45
Merge pull request #25896 from buff0k/patch-3 
fix: Correct South Africa VAT Rate
 2021-06-17 18:27:00 +05:30
Deepesh Garg
ceb9d9e870
Merge branch 'develop' into patch-3 2021-06-17 18:26:42 +05:30
Alan
f9390f596d
fix: auto unlink warehouse from item on delete (#26073) 
* fix: auto unlink warehouse from item on delete

* fix: sider

* refactor: use delete_doc

* test: add test for unlinking warehouse from item

* refactor: add msgprint to inform user of unlink

* refactor: cleanup and reuse extant functions

* fix: don't delete row, update table
 2021-06-17 18:13:23 +05:30
Deepesh Garg
d3ccb024f8
Merge pull request #26078 from nemesis189/fixed-label-rate-for-purchase-invoice-item-v13 
fix: removed extra space from label rate
 2021-06-17 17:19:17 +05:30
Deepesh Garg
1c58d79142
Merge pull request #26077 from nemesis189/fixed-label-rate-of-purchase-invoice-item 
fix: removed extra space from label rate
 2021-06-17 17:18:52 +05:30
Saqib Ansari
61675f1a43 fix: purchase receipt gl entries with same item code 2021-06-17 13:05:43 +05:30
Deepesh Garg
510077b3d4 fix(minor): Translation and linting issues 2021-06-17 11:21:21 +05:30
Deepesh Garg
b8442816ca Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payroll_accounting_dimension 2021-06-17 11:19:12 +05:30
Suraj Shetty
00332d1834 Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing 2021-06-17 09:47:16 +05:30
Deepesh Garg
913e92c29f
Merge pull request #26044 from GangaManoj/account-multiselect-gl 
feat(General Ledger): Implement multi-account selection
 2021-06-16 22:33:50 +05:30
Deepesh Garg
5c19a9251f fix: Accouting Dimensions for payroll entry accrual Journal Entry 2021-06-16 22:14:29 +05:30
Subin Tom
6f9de8c86f fix: removed extra space from label rate 2021-06-16 20:01:29 +05:30
Subin Tom
c03a947e98 fix: removed extra space from label rate 2021-06-16 19:47:55 +05:30
Saqib Ansari
2be7e90e78 fix(e-invoicing): IRN generation for export invoices with round off 2021-06-16 19:00:34 +05:30
GangaManoj
41b7c1aec0 fix(General Ledger): Improve account filter 2021-06-16 14:40:14 +05:30
Afshan
3b1b4684ba
fix: check for duplicate payment terms in Payment Term Template (#26003) 2021-06-16 14:30:45 +05:30
Afshan
8c73f6f19e
fix(pos): pos loyalty card alignment (#26051) 2021-06-16 14:28:26 +05:30
Afshan
d5c172590f
fix(pos): pos loyalty card alignment (#26050) 2021-06-16 14:28:03 +05:30
Saqib
60ce00531d
fix: label for enabling ledger posting of change amount (#26070) 2021-06-16 14:25:55 +05:30
GangaManoj
86f689e54a fix(General Ledger): Get account_currency accurately 2021-06-16 14:23:02 +05:30
Anurag Mishra
b1c72da7d7 fix: Training event 2021-06-16 14:08:32 +05:30
Saqib
1fd80992d7
fix(pos): 'NoneType' object is not iterable (#26066) 2021-06-16 13:27:34 +05:30
Ankush
fd84847f2b
fix: syntax fixes for native class (#26064) 2021-06-16 11:14:40 +05:30
Deepesh Garg
d70c6996f2
Merge pull request #25951 from nextchamp-saqib/invoice-opening-pnl-validation 
fix: opening invoices can alter profit and loss of a closed year
 2021-06-16 10:52:40 +05:30
GangaManoj
53a9ac4466 fix(General Ledger): Condense account_conditions 2021-06-16 04:10:29 +05:30
GangaManoj
79dc0f0afc fix: Remove console.log() 2021-06-16 03:37:11 +05:30
Deepesh Garg
fb9cb78980
Merge pull request #26045 from GangaManoj/filter-cc-project 
fix(General Ledger): Filter Cost Center and Project drop-down lists by Company
 2021-06-15 21:18:49 +05:30