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

27807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aditya Hase
6a5b7f751c perf(tests): Use setUpClass and tearDownClass instead of setUp and tearDown 2019-07-26 00:23:13 +05:30
Aditya Hase
a630a24040 fix(travis): Install wkhtmltopdf 2019-07-25 22:40:26 +05:30
Aditya Hase
fdb395c977 fix(travis): Remove redundant arguments 2019-07-25 21:51:12 +05:30
Aditya Hase
dac46ed6e1 fix(travis): Use --site parameter 2019-07-25 21:50:46 +05:30
Aditya Hase
6002fd7820 fix(travis): Merge install and before_script 2019-07-25 21:39:30 +05:30
Aditya Hase
4b680178be fix(travis): Execute get-app before bench start 2019-07-25 21:38:07 +05:30
Aditya Hase
5542af9be8 perf(travis): Use travis optimizations 2019-07-25 21:36:22 +05:30
Aditya Hase
1de45877b1 perf(travis): Do not build assets 2019-07-25 21:28:15 +05:30
Aditya Hase
13919440a7 perf(travis): Remove unnecessary processes from Procfile 2019-07-25 21:27:20 +05:30
Aditya Hase
543996652b fix(travis): Use MariaDB credentials from site_config.json 2019-07-25 21:25:53 +05:30
Aditya Hase
6f978d2497 perf(travis): Do not waste 10 seconds 2019-07-25 21:23:43 +05:30
Aditya Hase
97ad6352af fix(travis): Execute get-app and reinstall after bench start 2019-07-25 21:23:24 +05:30
Aditya Hase
6e2fa02c56 fix(travis): Do not disable scheduler using CLI 2019-07-25 21:21:54 +05:30
Aditya Hase
6f025e7b4f fix(travis): Do not use use_site 2019-07-25 21:21:19 +05:30
Aditya Hase
8005022508 fix(travis): Setup MariaDB 2019-07-25 21:19:30 +05:30
Aditya Hase
06ca6f7705 fix(travis): Remove unused files 2019-07-25 21:18:05 +05:30
Aditya Hase
ac185989ff fix(travis): Remove travis/bench_init.sh 2019-07-25 21:15:30 +05:30
Aditya Hase
306a410b77 fix(travis): Do not execute install.py 2019-07-25 21:11:18 +05:30
Aditya Hase
c49d45497c fix(travis): Install coverall after tests 2019-07-25 21:10:06 +05:30
Aditya Hase
828699f26a fix(travis): Use MariaDB 10.3 2019-07-25 21:09:34 +05:30
Aditya Hase
7204bcb932 fix(travis): Restructure build matrix 2019-07-25 17:48:17 +05:30
Aditya Hase
14600e6a3e fix(travis): Remove unnecessary commands 2019-07-24 15:18:52 +05:30
Aditya Hase
48d9cfe304 fix(website): Remove references to Product Settings.products_a… (#18448) 
This was accidentally added back in 34c551d9a5 (diff-f0a387cdb305471e74e523ecc4e646ac)
 2019-07-23 12:05:31 +05:30
Nabin Hait
7b76cdbb29 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2019-07-22 17:01:44 +05:30
Nabin Hait
cd1094e1c2 Merge branch 'rohitwaghchaure-stock_reco_for_serialized_items' into develop 2019-07-22 17:01:08 +05:30
Nabin Hait
ca25b925f5 fix: Calcellation logic for reconciliation of serialized items 2019-07-22 17:00:32 +05:30
Mangesh-Khairnar
3f8326358b fix: remove wrong status update for order type maintenance (#18444) 2019-07-22 16:24:56 +05:30
Suraj Shetty
88236b2a7d
feat: Email Campaign (#18291) 
feat: Email Campaign
 2019-07-22 15:34:38 +05:30
Suraj Shetty
433e587a95
style: Add tabs 2019-07-22 13:21:35 +05:30
Suraj Shetty
002474367b
Merge branch 'develop' into email-campaign 2019-07-22 13:20:06 +05:30
Rucha Mahabal
6224266512 fix: replaced frappe.db.get_value with frappe.db.exists 2019-07-22 13:04:43 +05:30
Rucha Mahabal
d23a95c06e fix: removed unnecessary fields from Campaign DocType and other fixes in Email Campaign 2019-07-22 12:26:52 +05:30
Rushin Parikh
40240b7d96 fix: filter reference name by cost center in journal entry account (#17948) 
* fix: filter reference name by cost center in journal entry account if reference_type is Sales Invoice or Purchase Invoice

* Update journal_entry.js
 2019-07-22 11:54:26 +05:30
Mangesh-Khairnar
0bbfca8142 fix: payment document link fix (#18301) 2019-07-22 11:49:18 +05:30
Mangesh-Khairnar
270c44a556 Enhancement(HR): hiring process (#18129) 
* feat: allow update of vacancies in staffing plan

* feat: update staffing plan on creation of job offer

* feat: update staffing plan after submit

* fix: change staffing plan on creation of employee

* fix: calculate vacancies based on job offers and staffing-plan

* test: job applicant creation

* feat: update job applicant on creation of job offer

* test: staffing plan creation

* fix: number of positions calculation

* test: job offer creation and update

* fix: update status of job applicant on change of job offer

* fix: linting

* fix: set number of positions

* fix: linting

* fix(job-offer): add a more descriptive message

* fix: translations in validation message

* Update validation message
 2019-07-22 11:47:53 +05:30
Anurag Mishra
305da799a4 Handling case for Material Request type 'Manufacture' v12 (#18365) 
* fix: status for 'material request type == Manufacture'

* Patch: for setting status

* fix: list view status
 2019-07-22 11:35:16 +05:30
Faris Ansari
74d5e9d32a fix: Set project in Timesheet (#18371) 
* fix: Set project in Timesheet

* style: Missing semicolon
 2019-07-22 11:34:00 +05:30
Faris Ansari
e3b3ac8a59 fix: Fetch email when making Opportunity from Lead (#18373) 2019-07-22 11:31:30 +05:30
Faris Ansari
7ed5919d5b fix(LoanApplication): Repayment amount check (#18376) 
* fix: Clickable Asset link

* fix(LoanApplication): Repayment amount check
 2019-07-22 11:30:05 +05:30
Mangesh-Khairnar
88620d6cbb fix: precision on comparing with the outstanding amount (#18375) 2019-07-22 11:29:26 +05:30
Mangesh-Khairnar
64c780e8c7 fix: update percentage on creation of invoice for zero amt transaction (#18382) 2019-07-22 11:28:58 +05:30
rohitwaghchaure
5be91173a1
Merge pull request #18108 from kaynes-technology/batch_bom_operations 
feat: Add batch operation times in BOM Operation
 2019-07-22 11:26:19 +05:30
Saurabh
90d7a8888f fix: pass missing argument while generating consolidated financial statement for cash flow type (#18398) 2019-07-22 11:22:34 +05:30
Anurag Mishra
23d4b7cc46 fis: mapped cost center in gl entries (#18404) 2019-07-22 11:22:03 +05:30
Himanshu
73d446023d fix: file attach via import (#18414) 2019-07-22 11:19:47 +05:30
Aditya Hase
dc42cc3998 fix(sales-invoice): Use orm instead of frappe.db.sql (#18434) 2019-07-22 11:19:07 +05:30
Aditya Hase
195465cdd9 fix(tally): Ignore unhandled vouchers silently (#18430) 
Vouchers that affect inventory entries but are not of type
Sales, Purchase, Credit Note, Debit Note are not handled.

Custom Vouchers are also not handled.
 2019-07-22 11:18:11 +05:30
Mangesh-Khairnar
16a0458e29 fix(procurement-tracker): concatenate filter conditions with leading whitespaces (#18440) 2019-07-22 11:16:40 +05:30
Deepesh Garg
60a291af8f fix: Sample qty validation fix in purchase receipt (#18419) 
Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
 2019-07-22 11:14:14 +05:30
crescent28
b978c9173d fix: added null check for filters (#18416) 
filters when None, at `filters.get("outstanding_amt_greater_than")` would result in an Attribute Error. This PR just adds a simple null-check in the if conditions. I'm awesome! 

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
 2019-07-22 11:13:27 +05:30