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

19699 Commits

Author SHA1 Message Date
Aditya Hase
0d333894c9 perf(tests): Use setUpClass and tearDownClass instead of setUp and tearDown 2019-07-26 05:54:04 +05:30
Aditya Hase
1e82638ae8 perf(tests): Remove unnecessary tearDown code 2019-07-26 03:52:17 +05:30
Aditya Hase
ff79463e36 perf(travis): Use setUpClass instead of setUp 2019-07-26 03:08:45 +05:30
Aditya Hase
6bc2988623 fix(stock): Fix travis builds 2019-07-26 03:08:45 +05:30
Aditya Hase
0f072d7d40 perf(tests): Use country with lesser fixtures 2019-07-26 01:11:57 +05:30
Aditya Hase
0ae786adec perf(tests): Do not unnecessarily create companies 2019-07-26 00:38:51 +05:30
Aditya Hase
6a5b7f751c perf(tests): Use setUpClass and tearDownClass instead of setUp and tearDown 2019-07-26 00:23:13 +05:30
Himanshu
2d8f42a007
Merge branch 'version-12-hotfix' into iss_ful_fix_v12 2019-07-25 16:58:37 +00:00
Mangesh-Khairnar
5ca3e83a00 feat: add ledger link in hr config 2019-07-25 14:35:39 +05:30
deepeshgarg007
f56284b0c1 Dynamic link issue fix in Bank reconciliation statement 2019-07-25 12:47:32 +05:30
deepeshgarg007
53dc0c52ca Dynamic link issue fix in Bank reconciliation statement 2019-07-25 12:44:50 +05:30
deepeshgarg007
b1f3e0224c fix: GSTR-1 query fix 2019-07-24 21:36:56 +05:30
deepeshgarg007
89339bb80c fix: GSTR-1 query fix 2019-07-24 21:32:55 +05:30
Anurag Mishra
0505135f90
Merge branch 'develop' into refactor-call-popup 2019-07-24 18:33:14 +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
Rohit Waghchaure
6d0c6a17d9 fix: multi currency bank reco issue 2019-07-24 12:48:06 +05:30
Himanshu Warekar
20e1a3e199 fix: reset issue fulfilled indicator 2019-07-23 17:00:23 +05:30
Himanshu Warekar
05425d414c fix: change agreement fulfilled to ongoing 2019-07-23 16:58:13 +05:30
Rohit Waghchaure
bcfbc792b4 fix: scrap item not adding while doing finished good entry 2019-07-23 16:05:29 +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
Mangesh-Khairnar
bb1be2e2ee chore: change fieldname for carried forward leave expiry 2019-07-23 13:18:40 +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
deepeshgarg007
a19d1d6926 fix: Fixes in stock ageing report 2019-07-23 08:30:09 +05:30
Mangesh-Khairnar
fd1d4c2927 chore: split expire allocation 2019-07-22 18:05:27 +05:30
Mangesh-Khairnar
08c02287dd fix: expiry allocaton after creating all the transactions 2019-07-22 17:47:03 +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
deepeshgarg007
d9cc84892b fix: Use get_serial_no and remove batch 2019-07-22 15:56:41 +05:30
Mangesh-Khairnar
f6cf58fa8c fix: change get all to sql list 2019-07-22 15:32:41 +05:30
deepeshgarg007
3877b5407c fix: Remove batch 2019-07-22 15:30:18 +05:30
Suraj Shetty
4177ecb6b2 Merge branch 'develop' of github.com:frappe/erpnext into refactor-call-popup 2019-07-22 15:18:03 +05:30
Mangesh-Khairnar
cbc22e6369 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-07-22 13:57:04 +05:30
Mangesh-Khairnar
29e9f14f95 fix: minor changes 2019-07-22 13:54:39 +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
deepeshgarg007
55ca054cb4 Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix 2019-07-22 12:46:30 +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