Commit Graph

23449 Commits

Author SHA1 Message Date
Nabin Hait
797497d22e Fixed web form perm for tasks 2018-07-23 17:58:40 +05:30
Prateeksha Singh
ebb5662cb7
[revert] modules dropdown 2018-07-23 17:04:34 +05:30
Ameya Shenoy
218f2f841e
Merge pull request #14920 from codingCoffee/split_issue
Split a given Issue into 2
2018-07-23 16:09:05 +05:30
Ameya Shenoy
769054e00d
Split a given Issue into 2
Bugs encountered:
Once the dialog pops up, filling in the subject and pressing RETURN
doesn't work. It fails to read the subject. The primary button needs to
be clicked on. This is a generic issue, not related to this PR

Behaviour:
-[x] Add button on communication to split thread
-[x] Popup asks for new subject
-[x] Copy "Customer", "Sender" and other relevant fields to this issue
-[x] Move thread and replies to new issue

fixes #14600
2018-07-23 10:31:38 +00:00
Nabin Hait
0c0c345678 Added index on SLE based on batch_no, item and warehouse 2018-07-23 14:38:50 +05:30
yimesgen
20a80fee45 Update batch.py (#14905)
* Update batch.py

Performance improvements for pos stock availability checks on a particular warehouse due to the slowing down effects of the where clauses combined by the "and".

* Update batch.py
2018-07-23 14:36:50 +05:30
Charles-Henri Decultot
6321a6b908 use standard dict method 2018-07-23 08:56:38 +00:00
Alchez
56bd5d8aaa Fix finance book getter error when book doesn't exist (#14987) 2018-07-23 14:16:35 +05:30
Nabin Hait
851ac754f7 minor fixes 2018-07-23 13:09:02 +05:30
Jamsheer
425fb4c5f4 [Feature][Enhance] Healthcare Inpatient (#14940)
* New DocTypes - Inpatient Record and Healthcare Service Unit Type

* Patient Appointment - Button - Get Prescribed Procedure - hide after save

* Patient Encounter - Schedule Inpatient button

* Inpatient - Healthcare Fields and references

Conflicts:
	erpnext/healthcare/doctype/lab_test/lab_test.json
	erpnext/healthcare/doctype/patient_appointment/patient_appointment.json
	erpnext/healthcare/doctype/patient_encounter/patient_encounter.json
	erpnext/healthcare/doctype/vital_signs/vital_signs.json

* Healthcare Service Unit Type - Item Creation - UOM Fix

* Healthcare Service Unit - healthcare service unit type fix

* Inpatient Record - Admission Scheduled and Discharge Scheduled status

* Patient - rename field inpatient to inpatient_status

* Inpatient Record - rename field inpatient to status

* Refactor - Inpateint Occupancy

* Remove unused imports

* Healthcare service unit - patch - fix

* Healthcare IP - Codacy Fix

* Inpatient Record - Encounter and Practitioner References

* Patch - add healthcare service unit tree - enhance

* Healthcare Setup - Remove - Lab Test and Item creation

* Discharge note in Inpatient Record

* Codacy fix

* Inpatient Record - Update transfer service unit filter

* Inpatient Record - Test
2018-07-23 13:05:35 +05:30
Saurabh
a638400e5d
Merge pull request #14707 from chdecultot/stripe_improvements_4
Stripe Subscriptions
2018-07-23 12:11:58 +05:30
Faris Ansari
f585197045 Cleanup homepage 2018-07-23 11:55:07 +05:30
darthguru
f2d4e33eb5 Fixed IGST ISSUE (#14975)
* Fixed IGST ISSUE

the flag was not getting reset causing only the first IGST value to be shown and the rest went into SGST and CGST this fixes it

* Update gstr_2.py
2018-07-23 11:52:26 +05:30
Ranjith Kurungadam
1e90dafef8 fixes Benefit Application, Additional Salary (#14971)
* fix - add Additional Salary if multiple in one slip

* fix - Benefit Appication, None comparison
2018-07-23 11:32:58 +05:30
Ranjith Kurungadam
68abe25371 fix - assigned Salary Structure query (#14965) 2018-07-23 11:31:46 +05:30
Shreya Shah
83dfc0a2b1 Add Priority field in issue webform and portal (#14967) 2018-07-23 11:14:00 +05:30
Faris Ansari
789ad180ea
Merge pull request #14969 from netchampfaris/financial-statement-reports
Financial Reports fixes
2018-07-21 12:28:31 +05:30
Faris Ansari
b23d15fba9 Fix typo 2018-07-20 18:16:31 +05:30
Faris Ansari
5e096df5ae columnDef => column 2018-07-20 16:35:51 +05:30
Faris Ansari
e7f864a4dd Return early if filters not initialized 2018-07-20 16:31:01 +05:30
Prateeksha Singh
abca510f9a
Update conf.js 2018-07-20 16:07:50 +05:30
Faris Ansari
5986d59b01 Financial Reports
- Update formatter for use with DataTable
- Fetch Currency from  filters and fallback to company currency
2018-07-20 15:11:55 +05:30
Charles-Henri Decultot
39418b1532 CSS correction due to latest version of develop 2018-07-20 09:37:22 +00:00
Rushabh Mehta
ce6e27a066 [minor] frappe 2018-07-19 17:47:04 +05:30
KanchanChauhan
0c3d345a9f [Minor] Moved mandatory Company field from More Information section to top (#14950) 2018-07-19 14:39:31 +05:30
Ranjith Kurungadam
dff2ba72d3 test TDS calculation (#14919)
* test TDS calculation

* fix failing test cases

* fix codacy
2018-07-19 14:34:05 +05:30
Saurabh
a8e24cba46 Merge patch and delete fields from subscription (#14941)
* Delete subscription records after migrating all records to auto-repeat

* delete old fields from subscription
2018-07-19 14:33:31 +05:30
Saurabh
139d165258
Merge pull request #14962 from saurabh6790/staging_version_1
Update staging version to support semantic versioning
2018-07-19 13:38:34 +05:30
Saurabh
dfdad651ea Update staging version to support symentic versioning 2018-07-19 13:36:32 +05:30
Nabin Hait
9c5afc3620 website permission for support portal 2018-07-19 13:02:36 +05:30
Nabin Hait
47ce481394 Minor fix 2018-07-19 11:10:46 +05:30
Prateeksha Singh
627d0d58be
[fiscal-year] use to_date property 2018-07-18 18:09:28 +05:30
Prateeksha Singh
8ecfaaa707 [fix] format fiscal year docname to proper date before using 🤦 (#14955) 2018-07-18 18:03:27 +05:30
Saurabh
d9d8dda5da
Merge pull request #14954 from saurabh6790/conflict_fixes
[minor] remove conflicts
2018-07-18 17:21:54 +05:30
Saurabh
0bfbf8aa6f [minor] remove conflicts 2018-07-18 17:21:07 +05:30
Saurabh
d7897f1c53 Resolved merge conflicts 2018-07-18 17:08:16 +05:30
Saurabh
8ca5940f76 Merge branch 'hotfix' 2018-07-18 16:24:54 +05:30
Saurabh
6c46b4edc4 bumped to version 10.1.43 2018-07-18 16:54:54 +06:00
Shreya Shah
8395a7ad6f Modifications in last purchase rate button (#14948)
* Make last purchase rate button visible until submitted

* Move buttons

- Get last purchase rate and link to material request buttons moved to toolbar under Tools button

* Remove disable fetch last rate functionality

* Make last purchase rate field read_only
2018-07-18 12:27:27 +05:30
Shreya Shah
9baa3bef8b [Portal] Display issues raised by all users of a customer (#14947)
* Display issues raised by all users of a customer

* Fixed as per review
2018-07-18 12:25:38 +05:30
Faris Ansari
9e874af9ba Query report print (#14935)
* QueryReport

- Only print visible columns in report
- Use get_columns_for_print method instead of directly
accessing report.columns

* Query Report

- Replace frappe.query_report_filters_by_name with new API
2018-07-18 09:28:44 +05:30
Charles-Henri Decultot
9d09343e57 Gocardless improvement and payment request correction 2018-07-17 16:15:30 +00:00
Rushabh Mehta
69fa808def [minor] fixes + patch (#14937) 2018-07-17 18:22:51 +05:30
Shreya Shah
3c9839f832 Defaults in Item Group (#14874)
* Add Defaults table in Item Group

* Fetch defaults from Item group if not found in Item

* Add patch

* Remove default fields from Item Group

* Set query for defaults

* Fix Codacy

* Modify test records

* Modify budget.py and sales_order.py

* Remove join from query

* Else condition to avoid error if no defaults found

* refrain from making item test records before item_group

* default cost center fetch correction

* Remove tab item group from query
2018-07-17 18:01:44 +05:30
rohitwaghchaure
6863b03790 Naming series increase even if there is an exception while saving the invoice from the backend (#14938) 2018-07-17 17:20:15 +05:30
rohitwaghchaure
a76067eea1 [Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order (#14899)
* [Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order

* Added test cases
2018-07-17 16:50:50 +05:30
Saurabh
af479c8192 set valid delivery date (#14890)
* set valid delivery date

* calculate delivery date based on diffrence in transation date and delivery date of ref doc
2018-07-17 16:49:32 +05:30
rohitwaghchaure
216f9373c9 Provision to select the cost center in the asset (#14934) 2018-07-17 16:47:51 +05:30
Shreya Shah
663b435919 Update modified time to fix patch (#14931) 2018-07-17 16:47:18 +05:30
Saurabh
e78a877202 patch fixes (#14936) 2018-07-17 16:38:11 +05:30