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

27816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aditya Hase
d1bb274c22 perf(tests): Use country with lesser fixtures 2019-07-26 05:54:04 +05:30
Aditya Hase
8773d931be perf(tests): Do not unnecessarily create companies 2019-07-26 05:54:04 +05:30
Aditya Hase
0d333894c9 perf(tests): Use setUpClass and tearDownClass instead of setUp and tearDown 2019-07-26 05:54:04 +05:30
Aditya Hase
b6906c58d1 fix(travis): Install wkhtmltopdf 2019-07-26 05:54:04 +05:30
Aditya Hase
0046357b86 fix(travis): Remove redundant arguments 2019-07-26 05:54:04 +05:30
Aditya Hase
ac431c8e33 fix(travis): Use --site parameter 2019-07-26 05:54:04 +05:30
Aditya Hase
7b39aa7f91 fix(travis): Merge install and before_script 2019-07-26 05:54:03 +05:30
Aditya Hase
6076443b6b fix(travis): Execute get-app before bench start 2019-07-26 05:54:03 +05:30
Aditya Hase
50e2d4aa6a perf(travis): Use travis optimizations 2019-07-26 05:54:03 +05:30
Aditya Hase
e31284189f perf(travis): Do not build assets 2019-07-26 05:54:03 +05:30
Aditya Hase
30628b016b perf(travis): Remove unnecessary processes from Procfile 2019-07-26 05:54:03 +05:30
Aditya Hase
7c44adad3e fix(travis): Use MariaDB credentials from site_config.json 2019-07-26 05:54:03 +05:30
Aditya Hase
e4f78a0b6a perf(travis): Do not waste 10 seconds 2019-07-26 05:54:03 +05:30
Aditya Hase
903e87899b fix(travis): Execute get-app and reinstall after bench start 2019-07-26 05:54:03 +05:30
Aditya Hase
1e9e471714 fix(travis): Do not disable scheduler using CLI 2019-07-26 05:54:03 +05:30
Aditya Hase
fb2ec7186d fix(travis): Do not use use_site 2019-07-26 05:54:03 +05:30
Aditya Hase
185e2a2fd8 fix(travis): Setup MariaDB 2019-07-26 05:54:03 +05:30
Aditya Hase
e2b16e3edb fix(travis): Remove unused files 2019-07-26 05:54:03 +05:30
Aditya Hase
23f24d13dd fix(travis): Remove travis/bench_init.sh 2019-07-26 05:54:03 +05:30
Aditya Hase
3f6ac2d993 fix(travis): Do not execute install.py 2019-07-26 05:54:03 +05:30
Aditya Hase
2fb9e8a94d fix(travis): Install coverall after tests 2019-07-26 05:54:03 +05:30
Aditya Hase
9b24a42017 fix(travis): Use MariaDB 10.3 2019-07-26 05:54:03 +05:30
Aditya Hase
e0e78fb0e2 fix(travis): Restructure build matrix 2019-07-26 05:54:03 +05:30
Aditya Hase
029de1a244 fix(travis): Remove unnecessary commands 2019-07-26 05:54:03 +05:30
sahil28297
29c71f5bd5
Merge pull request #18467 from scmmishra/release-notes-fixes 
fix: urls for changelog
 2019-07-24 16:14:00 +05:30
sahil28297
6bd50b1e20
Merge branch 'version-12-hotfix' into release-notes-fixes 2019-07-24 16:13:44 +05:30
Shivam Mishra
8b08684e07 fix: more url fixes 2019-07-24 16:10:34 +05:30
Shivam Mishra
cb19ee457c fix: urls for changelog 2019-07-24 16:05:59 +05:30
Rucha Mahabal
4865eabee5 fix: add Company by default in session defaults (#18460) 2019-07-24 13:37:54 +05:30
Faris Ansari
06c7a7e660
fix(website): Remove references to Product Settings.products_a… (#18451) 
This was accidentally added back in 34c551d9a5 (diff-f0a387cdb305471e74e523ecc4e646ac)
 2019-07-23 13:40:40 +05:30
Saurabh
85d88395ba changelog: release 12.0.0 2019-07-22 17:39:30 +05:30
sahil28297
3e85b4937b
Release Version 12 2019-07-22 17:31:14 +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