Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,816 Commits 3 Branches 0 Tags 1 GiB
70b3edd502
Commit Graph

31816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marica
7bc9352546
Merge branch 'develop' into variant-error-msg 2020-06-17 19:22:49 +05:30
marination
91dfd000ed fix: Typo 2020-06-17 19:05:40 +05:30
Shivam Mishra
64d772480b
fix: limit max length for cards (#22289) 2020-06-17 18:48:15 +05:30
Shivam Mishra
dec17d5ce4
Merge pull request #22288 from scmmishra/support-portal-fixes 2020-06-17 13:14:49 +00:00
Shivam Mishra
6e231ae0cb refactor: remove translation 2020-06-17 18:43:59 +05:30
Shivam Mishra
2462f07c87 refactor: update titles 2020-06-17 18:39:49 +05:30
Shivam Mishra
2b18bdfe72 fix: title for support 2020-06-17 18:36:51 +05:30
marination
b9c38a13d1 chore: Remove unnecessary get_doc 2020-06-17 18:36:12 +05:30
Shivam Mishra
7057a807ca refactor: minor layout fixes to portal 2020-06-17 18:35:38 +05:30
marination
8b19d01d57 fix: Quality Procedure Fixes 
- Dont prompt error message if parent is the same in child
- filter child procedure field
- Disable New button in tree view
- Editable grid for Quality Procedure Proces table.
 2020-06-17 18:35:27 +05:30
Marica
5f3cdce353
Merge branch 'develop' into quality_procedure_fix 2020-06-17 18:27:04 +05:30
Kaviya Periyasamy
fec894f530
fix: modified time updated with the latest date (#22286) 2020-06-17 17:39:12 +05:30
Abhishek Balam
a4cd9e2389 use getdate() for comparing dates 2020-06-17 17:13:13 +05:30
Afshan
8546b71358
feat: /support (#22194) 
* added: /support

* refactor code and implemented fail checks

* removed unused imports

* changed filter from from title to name

* refactor code to move context inside main

* removed unused variable

* added: /support

* refactor code and implemented fail checks

* removed unused imports

* changed filter from from title to name

* refactor code to move context inside main

* removed unused variable

* refactor: renamed set to get

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2020-06-17 16:16:59 +05:30
Deepesh Garg
179365683f
Merge pull request #22265 from frappe/edu-academic-term-validation 
fix: Adding filter in academic term
 2020-06-17 15:34:47 +05:30
Deepesh Garg
0511e8cc03
Merge branch 'develop' into rcm_develop 2020-06-17 15:33:29 +05:30
Marica
10d8aa0225
Merge pull request #22283 from marination/expense-account-message-develop 
fix: Message Formatting for missing Expense Account
 2020-06-17 14:01:10 +05:30
marination
17422a3e45 fix: Message Formatting 2020-06-17 14:00:45 +05:30
Marica
6e751440cf
Merge branch 'develop' into quality_procedure_fix 2020-06-17 13:49:46 +05:30
Anupam Kumar
c6592c880a
fix: Student Admission (#22255) 
* Student Admission fix

* adding check for application

* adding check for application

* updating error message

* added date_diff for date comparision
 2020-06-17 12:38:31 +05:30
rohitwaghchaure
67022b2d15
Merge pull request #22275 from frappe/mergify/bp/develop/pr-22267 
refactor: hide company currency fields in the routing (bp #22267)
 2020-06-17 12:27:40 +05:30
Anupam K
8d4ba6c7ec Adding filter in academic term 2020-06-17 11:48:15 +05:30
Anupam Kumar
0a3c34de01
address label chages (#22137) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-17 10:53:13 +05:30
rohitwaghchaure
8d856659af refactor: hide company currency fields in the routing (#22267) 
(cherry picked from commit fd3ff6be18b0bd5accc88aea22e3adfe48e62aff)
 2020-06-17 05:22:45 +00:00
Kenneth Sequeira
c159556c24
fix: typo for language in Terms description (#22270) 2020-06-17 09:34:58 +05:30
Anurag Mishra
58831ecc7d
fix(HR): wrong shortcut in desk page (#22269) 2020-06-16 19:23:52 +05:30
Marica
74f34c2ee3
Merge branch 'develop' into update-items-permission-fix 2020-06-16 17:18:33 +05:30
rohitwaghchaure
64c0e8f325
Merge pull request #22257 from rohitwaghchaure/fixed-travis-for-develop-branch 
fix: travis for develop
 2020-06-16 12:38:10 +05:30
Rohit Waghchaure
fa6e4f62e2 fix: travis for develop 2020-06-16 12:02:58 +05:30
Marica
2112834743
fix: Handle unavailable Variants in Website (#22195) 
* fix: Handle unavailable Variants in Website

* fix: Fetch cart setting from argument
 2020-06-16 00:20:57 +05:30
marination
87dafb4d70 Merge branch 'develop' of https://github.com/frappe/erpnext into rfq-multi-uom 2020-06-15 17:44:04 +05:30
marination
ae862c993b feat: Multi UOM support in Request for Quotation 2020-06-15 17:38:47 +05:30
rohitwaghchaure
d8683d381b
Merge pull request #22205 from deepeshgarg007/fiscal_year_travis 
fix: Travis(develop)
 2020-06-15 16:12:10 +05:30
Deepesh Garg
a66ce050ff fix: Minor fixes in loan 2020-06-15 16:03:12 +05:30
rohitwaghchaure
75366ebaec
Merge pull request #22243 from Anurag810/expense-claim-standard-filter-fix 
fix: added some standard filters in expense claim
 2020-06-15 15:36:37 +05:30
rohitwaghchaure
21a95e1327
Merge pull request #22242 from Anurag810/employee_fix 
fix(hr): allow to enter Relieving date if status = Left
 2020-06-15 15:35:22 +05:30
Himanshu
b075a621c5
Merge pull request #21617 from ruchamahabal/sla-enhancements 
feat: Issue Metrics and SLA Enhancements
 2020-06-15 15:28:28 +05:30
Deepesh Garg
c2496a3600 fix: Asset maintenance test 2020-06-15 15:18:49 +05:30
Rucha Mahabal
b8b11bb8ea
Merge branch 'develop' into sla-enhancements 2020-06-15 15:11:40 +05:30
rohitwaghchaure
d9fbc737e5
Merge pull request #22246 from marination/backflush-rm-rate 
fix: Wrong key sent to get_valuation_rate
 2020-06-15 14:50:19 +05:30
marination
8a0058787e fix: Wrong key sent to gte_valuation_rate 2020-06-15 14:40:39 +05:30
Rucha Mahabal
096792791b fix(patch): reload child tables 2020-06-15 14:07:06 +05:30
Rucha Mahabal
30487bd854 fix: codacy issues 2020-06-15 13:49:58 +05:30
P-Froggy
2957a631db
fix: Validation of Purchase Order against Material Request missing (#22192) 
Validation of Purchase Order and Purchase Order Item against the linked Material Request Item was missing, so it was possible to exchange items in the purcahse order against others and still fullfill the material request.

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-15 13:41:16 +05:30
Rucha Mahabal
bf26b10df4
Merge branch 'develop' into sla-enhancements 2020-06-15 13:15:03 +05:30
Anurag Mishra
45b6fed029 fix: added some standard filters in expense cliam 2020-06-15 12:44:55 +05:30
Anurag Mishra
a2cf79da0f fix: allow to enter Releaving date if status = Left 2020-06-15 12:28:31 +05:30
Deepesh Garg
0d880079b1 fix: Validation for group cost center 2020-06-15 12:23:24 +05:30
marination
8d68ba37bb Merge branch 'update-items-permission-fix' of https://github.com/nextchamp-saqib/erpnext into update-items-permission-fix 2020-06-15 12:18:16 +05:30
marination
b7e94cc742 fix: Travis 2020-06-15 12:16:30 +05:30