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
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
Rucha Mahabal
324ab98b99
Merge branch 'email-campaign' of https://github.com/ruchamahabal/erpnext into email-campaign
2019-07-22 03:27:29 +05:30
Rucha Mahabal
8d994cb1f2
fix: allow only 1 active Email Campaign for a lead/contact at a time
2019-07-22 03:26:40 +05:30
Rucha Mahabal
b54459e588
dash: added Email Campaign to CRM dashboard
2019-07-22 03:23:40 +05:30
Rohit Waghchaure
93b7ece8b0
fix: disable field's fieldtype changed from data to check
2019-07-21 00:02:09 +05:30
Suraj Shetty
34b4b77920
Merge branch 'develop' into email-campaign
2019-07-20 19:42:16 +05:30
deepeshgarg007
2ddbebfae0
fix: Condition fix
2019-07-20 14:52:59 +05:30
deepeshgarg007
e097d4f470
fix: Assignment fix
2019-07-20 14:49:32 +05:30
deepeshgarg007
1ee3d040a1
fix: Condition fix in get_balance_on function
2019-07-20 14:46:59 +05:30
Anurag Mishra
d1d8d24d0f
fix: filters conditions in loan repayment ( #18428 )
2019-07-20 06:31:22 +05:30
Karthikeyan S
fcdcfbf302
fix(loan): Loan Tenure Formula ( #18424 )
2019-07-20 00:18:44 +05:30
Karthikeyan S
747c2624cd
fix(BOM): Sever Error due in bom query to new behaviour of db.escape in v12 ( #18401 )
...
fixes bug introduced by commit 6a7969117f
2019-07-19 22:49:21 +05:30
Rucha Mahabal
a566b4e24a
Merge branch 'develop' into email-campaign
2019-07-19 15:07:56 +05:30
Himanshu
0a8816e053
feat(Google Maps): Google Maps Refactor [Unified Google API Settings] ( #18110 )
2019-07-19 14:38:04 +05:30
Deepesh Garg
fefe4ac095
Merge pull request #18381 from surajshetty3416/fix-payroll-UI
...
fix: Show submit after salary slip creation
2019-07-19 12:09:21 +05:30
Deepesh Garg
b7fc8fded8
Merge pull request #18397 from surajshetty3416/employee-skill-map-config
...
fix: Add Employee Skill Map to HR module page
2019-07-19 12:07:39 +05:30
Salmanmulani
b752acf803
fix: added default value for projected_qty in bin_dict
...
`projected_qty` if not in `bin_dict` would return None. And when compared to an integer would result in a TypeError.
This PR fixes this
Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
2019-07-19 11:44:49 +05:30
Suraj Shetty
d33c2337cf
Merge branch 'develop' into employee-skill-map-config
2019-07-19 10:45:03 +05:30