Commit Graph

231 Commits

Author SHA1 Message Date
Nabin Hait
49b41e49ae fix: Added permissions in GST Settings and added filters for accounts based on company 2019-01-24 17:55:44 +05:30
Aditya Hase
f3c22f342c fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30
Rohit Waghchaure
7e71e132a3 Added patch 2019-01-18 11:47:31 +05:30
Saurabh
68ea608ca8 fix: import unicode_literals 2019-01-15 14:47:32 +05:30
Suraj Shetty
c349ae26b9 Add patch to rename additional salary component
- Should fix https://pastebin.com/xsNHPAh6
(happens when clicking links option in menu of Employee master)
2019-01-02 09:31:11 +05:30
rohitwaghchaure
56c5d8b784
Merge pull request #16286 from rohitwaghchaure/fixed_patch_rename_bom_wo_fields
[Fix] Patch rename_bom_wo_fields
2018-12-26 16:26:19 +05:30
Rohit Waghchaure
8406720a7a [Fix] Patch rename_bom_wo_fields 2018-12-26 16:25:44 +05:30
rohitwaghchaure
53a38e8edc
Merge pull request #16257 from surajshetty3416/permission-fixes
Fix user permission checks
2018-12-26 14:49:01 +05:30
Suraj Shetty
488aa86f70 Skip some codacy warnings 2018-12-25 14:46:44 +05:30
rohitwaghchaure
4265c5a772 Rename BOM and Work order fields (#16209)
* Rename BOM and Work order fields

* Rearranged BOM fields
2018-12-24 14:38:49 +05:30
Suraj Shetty
7ae2d59ffd
Merge branch 'staging-fixes' into permission-fixes 2018-12-18 15:41:03 +05:30
Rohan
c1eb94d37f Revert "fix(delivery): update package total on validate (#16131)"
This reverts commit f43433b43d.
2018-12-10 20:27:14 +05:30
Suraj Shetty
07e5786e1b Fix user permission checks 2018-12-10 19:10:18 +05:30
Rohan
f43433b43d fix(delivery): update package total on validate (#16131) 2018-12-10 17:47:31 +05:30
Ranjith
5d2e52c4ef fix: healthcare patch 2018-11-19 20:03:25 +05:30
Nabin Hait
a0a2f58a21
Merge pull request #15985 from adityahase/perf-patch
perf(patch): Use INSERT with ON DUPLICATE KEY UPDATE
2018-11-15 14:50:58 +05:30
Rohit Waghchaure
43920530a1 [Minor] Patch fixes 2018-11-15 12:20:27 +05:30
Aditya Hase
d168a71cfb perf(patch): Use INSERT with ON DUPLICATE KEY UPDATE
update_total_qty_field patch was using UPDATE statement with CASE

Now use INSERT INTO with ON DUPLICATE KEY UPDATE clause which
allows this query to use indexes and update multiple rows per query.
2018-11-14 19:09:07 +05:30
Nabin Hait
d34bfa8c2c fix(patch): Fetch missing gst hsn code in transactions and set hsn-wise taxes 2018-11-13 18:21:22 +05:30
Alchez
ce3340903d Update Delivery Trip status based on visited stops (#15723)
* feat(delivery_trip_status): Update Delivery Trip status based on visited stops

* feat(delivery_trip_status): Fix tests

* feat(delivery_trip_status): Fix allow on submit for status

* feat(delivery_trip_status): Change status mapping

* feat(delivery_trip_status): Fix patch

* Update update_delivery_trip_status.py
2018-11-13 12:22:17 +05:30
Rohit Waghchaure
56bf39bfea [Fix] Patch 2018-11-06 16:32:29 +05:30
deepeshgarg007
0cbb9b54fa Deprecating subscriber doctype (#15695)
* Depricating subscriber doctype

* Removed naming series
2018-10-16 14:39:16 +05:30
Ameya Shenoy
102eb998ac
fix(patch): reload healthacre doctypes
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
2018-10-15 17:40:02 +05:30
Jamsheer
2a966f26af fix: patch - change healthcare desktop icons (#15683) 2018-10-15 14:54:29 +05:30
Shreya Shah
e9890a3ec8 fix(patch): Check if meta object has naming_series field (#15651) 2018-10-11 16:28:59 +05:30
Faris Ansari
4833b4c274 fix: Default Series in naming series patch (#15656) 2018-10-11 16:27:05 +05:30
Sagar Vora
d92f3ac480 Fix 'transporter info' section in Delivery Note (#15565)
- create is_transporter checkbox in supplier doctype
- new field transporter (supplier with is_transporter checked)
- created fields driver and driver_name
- removed GST India fields from core doctype
- removed readonly & allow_on_submit from fields (delivery trip applicable only for in-house delivery)
- read_only transporter_name field (kept for backwards compatibility)
- made necessary changes in delivery_trip implementation
- hidden section's fields from print (preserving v10 convention)
- added transporter field to 'Driver' doctype
- added queries for transporter and driver fields
- GST India fields in regional module
- Fix e-waybill report
2018-10-10 14:51:26 +05:30
Shreya Shah
dd87e0f1e2 fix(leave-type): Drop column max_days_allowed (#15642) 2018-10-10 14:48:49 +05:30
Jamsheer
14c6ab0ee9 [fix] Healthcare field and desktop icon (#15638)
* Test Inpatient Record - Fix

* Test Inpatient Record - Fix

* Healthcare - Patch rename_healthcare_doctype_and_fields - Updated

* Healthcare - Desktop Icons - Updated

* Healthcare - Patch change  in healthcare desktop icons

* Healthcare Util - fix - appointments valid in fee validity

* Healthcare Settings - field label change

* Patient allow rename

* fix: remove unused variable
2018-10-10 14:44:36 +05:30
Ameya Shenoy
f7b5b7beb4 fix: make location from warehouse patch
- optimization by preventing patch execution if Asset doesn't exist
2018-10-07 13:08:00 +05:30
Ranjith Kurungadam
dc2bab2b72 fix healthcare patch (#15584) 2018-10-05 11:36:58 +05:30
Charles-Henri Decultot
75fa6b3ee8 [Enhancement] Improvement to the sales pipeline (#15524)
* Additions to sales pipeline

* Codacy corrections

* Codacy corrections

* Codacy corrections

* Replace _ with dummy for unused variable

* Performance + dates corrections

* Itertuples modification

* Removing trailing whitespaces

* Sales stage doctype

* Divide sales stages fixtures in separate functions

* Remove duplicate fixtures

* Add newline after method

* Missing requirement
2018-10-03 10:41:40 +05:30
Charles-Henri Decultot
b2281cc1fd Lead to customer UX enhancement (#15525)
* Lead to customer UX enhancement

* Market segment

* Market Segment to DocType

* Specific function for fixtures

* Merge issue correction

* Doctype merge correction
2018-10-02 11:25:00 +05:30
Alchez
6ecb2556b7 Add Delivery Settings + improve 'Notify Customers' functionality (#15322)
* Add Delivery Settings + improve 'Notify Customers' functionality

* Minor improvements

* Add patch to create a default dispatch notification template

* Fix travis errors
2018-09-30 21:38:47 +05:30
Ameya Shenoy
12ec142a69
fix(multiple): syntax and patch
- syntax fix for using super class
- check "All Departments" in department name with translations
2018-09-26 14:05:48 +05:30
Ameya Shenoy
28fd02e4a8 fix(desktop_icon): remove land unit icon if exists (#15430)
* fix(desktop_icon): remove land unit icon if exists

Patch to delete the 'Land Unit' icon form 'Desktop Icon' doctype if
exists, since 'Land Unit' has been merged with 'Location'

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>

* Update remove_land_unit_icon.py
2018-09-19 13:15:52 +05:30
Jamsheer
c07e8e5b0d [Fix] Healthcare minor fixes and field rename (#15413)
* Healthcare practitoiner in Clinical Procedure

* Insert and Update Patient Medical Record from Healthcare DocTypes

* vital signs remove extra columns

* Rename Healthcare Field test_name

* Healthcare Util - get_drugs_to_invoice - fix

* Rename Healthcare Field test_code

* Rename Healthcare Field test_comment

* Rename Healthcare Field test_created

* Rename Healthcare Field test_template

* Rename Healthcare Field test_rate

* Rename Healthcare Field test_description

* Rename Healthcare Field test_groups

* Rename Healthcare Field test_group

* Rename Healthcare Field test_template_type

* Rename Healthcare Field test_uom

* Rename Healthcare Field test_normal_range

* Rename Healthcare Field test_event

* Rename Healthcare Field test_prescription

* Rename Healthcare Field test_particulars

* Patch - Rename healthcare fields

* Sales Invoice - Filter updated for get drugs to invoice

* Patient Appointment - fix - get_event
2018-09-18 10:54:03 +05:30
Nabin Hait
9fde97cdd2 Fixed merge conflict 2018-09-12 15:45:20 +05:30
Zlash65
4b0e3741b2 job card patch use orm 2018-09-10 12:18:51 +05:30
Zarrar
8448d9014d [Fix] Patch fixes (#15350)
* fix typo in fieldname

* fallback for work_order/production_order in timesheet
2018-09-09 19:18:41 +05:30
Nabin Hait
73165ebd33 fix(patch): create healthcare patch only if domain activated 2018-09-07 18:44:14 +05:30
Nabin Hait
562d942a7d fix(patch): gst state number in address where number is less than 10 2018-09-07 16:14:44 +05:30
Zarrar
7737620ff4 [Staging] Patch fix - Shopify Settings (#15338)
* keep enable_shopify in Shopify Settings disabled by default

* patch fix for shopify refactor

* minor fallback fix
2018-09-07 13:19:33 +05:30
Rohit Waghchaure
e74a39752f [Fix] Patch 2018-09-06 22:38:03 +05:30
rohitwaghchaure
32dc3bf082 [Enhance] Job Card (#15244)
* [Enhance] Added job card against the work order

* removed work order from timesheet

* Fixed codacy

* Added patch to make job card from the timesheet

* Timer in job card

* Dates validation in job card

* Added button to make job card from work order

* Added sub-assembly operation in the work order
2018-09-06 19:21:48 +05:30
Nabin Hait
b94008dab3 fix(patch): reload loyalty program in healthcare patch 2018-09-06 14:27:03 +05:30
Nabin Hait
aacb915cae Merge branch 'healthcare_v11_wip' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-healthcare_v11_wip 2018-09-05 17:21:47 +05:30
Nabin Hait
5122a8e0d7 Merge branch 'staging' into develop 2018-09-05 11:47:30 +05:30
Prateeksha Singh
adef70f8df [hub] update_hub_url patch to use marketplace_url 2018-09-03 16:12:50 +05:30
Saurabh
7b38d93e03 [fix] setup lang in patch 2018-09-03 16:07:40 +05:30
Jamsheer
8f808cbaf6 Patch - redesign healthcare billing work flow - fix 2018-09-03 11:26:19 +05:30
Jamsheer
a5c3fc69b8 Patch - Healthcare - Invoice - fix 2018-09-03 11:26:17 +05:30
Jamsheer
7f51ffa5eb Patch - Healthcare - Redesign Billing - fix 2018-09-03 11:26:16 +05:30
Jamsheer
fd2879c077 Patch - Healthcare - Redesign Billing 2018-09-03 11:26:16 +05:30
Saurabh
0754ece288 Patch fixes (#15295)
* patch fixes

* [Fix] disable shopify if any exception occured while
2018-09-03 10:44:40 +05:30
Faris Ansari
c05bf262f1
Merge pull request #15279 from netchampfaris/marketplace-fixes-3
- feat: Add disable marketplace option in Hub Settings
- fix: Rename Hub Settings -> Marketplace Settings
2018-08-31 16:52:26 +05:30
Faris Ansari
f9a66c1c36 fix: Rename Hub Settings -> Marketplace Settings 2018-08-31 16:30:34 +05:30
Charles-Henri Decultot
7e86d7b014 Add default payable account for expense claims (#15246) 2018-08-30 19:18:26 +05:30
Faris Ansari
114d595de9 fix: Set hub_url in Hub Settings
- add patch to set the value
2018-08-29 18:24:49 +05:30
Prateeksha Singh
bd7d964848 [hub] Merge Develop 2018-08-28 18:25:07 +05:30
Nabin Hait
a626d967c0 [fix] naming series refactor patch 2018-08-28 16:08:22 +05:30
Nabin Hait
24efd19895 [fix] naming series refactor patch 2018-08-28 15:47:08 +05:30
Nabin Hait
0e7a6856a7 [fix] naming series refactor patch 2018-08-28 15:44:46 +05:30
Nabin Hait
2d28eccdcf [fix] naming series refactor patch 2018-08-28 15:18:48 +05:30
Nabin Hait
2b9186da5a [fix] naming series patch 2018-08-28 15:02:59 +05:30
Nabin Hait
b2c94c0307 [fix] for python 3 2018-08-28 14:39:47 +05:30
Shreya Shah
a5add289bb Refactor Naming Series (#15070)
* Patch to create Property Setter for existing naming series

* Update existing naming series options with new

* Add patch link to patches.txt

* Update patch

* Fix codacy

* Fix as per suggestions

* Remove old patch for property setter

* Improve as per suggested

- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname

* Fix Travis

* Rebase with develop
2018-08-28 13:44:48 +05:30
Saurabh
51570f731c [Fix] patch fixes for V11 migration 2018-08-27 17:00:51 +05:30
Prateeksha Singh
a5f6e54b70 fix merge conflict 2018-08-06 13:56:53 +05:30
Nabin Hait
14ad9f70b5 Patch fixes 2018-07-31 17:33:14 +05:30
Nabin Hait
cce7c5c245 Fixed salary structure employee patches 2018-07-30 10:52:51 +05:30
Prateeksha Singh
6e7fb71f1f [hub][patch] reset publish_in_hub for all items 2018-07-27 22:02:47 +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
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
Saurabh
e78a877202 patch fixes (#14936) 2018-07-17 16:38:11 +05:30
Nabin Hait
1e693fe6c9 Replaced spaces with tabs 2018-07-17 16:08:39 +05:30
Zarrar
fc0a5833a5 run set query if doctype exist (#14929) 2018-07-17 11:57:06 +05:30
Suraj Shetty
6dfc165193 Add patch to skip user perm check for doctype (#14873)
* Add patch to skip user perm check for doctype

Skip user permission check for doctypes where
department link field was recently added

* Remove new doctype entries

* Skip doctypes if department field already exists (custom field)

* Add patch to set department value based on employee

* Update set_department_for_doctypes.py

* Update skip_user_permission_check_for_department.py
2018-07-16 18:10:16 +05:30
Jamsheer
f926911399 [Enhance][Fix] Healthcare - DocType and Fields renaming (#14861)
* Rename DT - Physician Schedule Time Slot to Healthcare Schedule Time Slot

* Role name change

* Rename DT - Physician Schedule to Practitioner Schedule

* Rename DT - Physician Service Unit Schedule

* Rename DT - Physician to Practitioner

* Lab Test Template - field disabled in standard filter

* Patient - customer creation fix

* Rename DT - Consultation - Encounter

* Patches.txt updated for rename doctypes and fields in Healthcare

* Patch - Rename doctypes and fields in Healthcare Domain

* Fix - Patch - rename_healthcare_doctype_and_fields

* Vital Signs - New Fields - Abdomen, Tongue and Reflexes

* Web Form - Patient - Personal Details

* Rename DocType Physician to Healthcare Practitioner

* Rename DocType Consultation to Patient Encounter

* Web Form - Personal Details - Fix

* Web Form - Personal Details - Codacy Fix

* Healthcare patch run for all domain

* Rename label Practitioner to Healthcare Practitioner

* Rename Encounter to Patient Encounter
2018-07-16 18:08:53 +05:30
Nabin Hait
656016b4e0 Reloaded location doctype in patch 2018-07-15 20:10:23 +05:30
rohitwaghchaure
526ab2ca30 [enhance] Allow transfer for manufacture in the BOM (#14891)
* [enhance] Allow transfer for maufacture in the BOM

* Added patch

* Fix codacy

* Fixed typo and added test cases
2018-07-15 20:04:41 +05:30
Zarrar
f579a2bd5d [Minor] Fix Crop Cycle test record (#14901)
* fix crop cycle test record

* load crop cycle doc if not yet loaded

* create test records for location

* land unit -> location , update in patch for tree index
2018-07-15 20:04:24 +05:30
Alchez
df1eae8981 Merge the Land Unit doctype with the Location doctype (#14613)
* Merge Land Unit with the Location doctype

* Fix patch

* [minor] modification to Location structure

- Create a group node "All Land Units" and place all the land units
under it
- Remove "Linked Analysis" from location
2018-07-13 12:50:04 +05:30
Shreya Shah
c8c17ff5cf Return if Item Defaults exist (#14834) 2018-07-06 18:07:28 +05:30
Rushabh Mehta
df23c7dc0c
[cleanup] bunch of UX fixes (#14787)
* [cleanup] add dashboard to leave policy, employee form cleanup

* [test] first_name in employee

* [fix] tests

* [fix] tests

* [fix] tests

* [hr] add more dashboards

* [minor] fixes + ux
2018-07-05 15:19:28 +05:30
Nabin Hait
24ee7e5eb1 Patch fix 2018-07-03 13:15:47 +05:30
Nabin Hait
9911309631 Patch fixes 2018-07-03 13:06:49 +05:30
Shreya Shah
93d60869ed Fix patch (#14769)
Income account instead of expense account
2018-07-03 10:07:32 +05:30
Zarrar
dfe897b888 [ Fix ] UOM Conversion fix (#14768)
* increase precision for conversion value

* inverse the conversion data

* update uom data

* rectify conversion logic according to inversion of values

* rectify test case for uom conversion

* patch improv to correct conversion data
2018-07-01 16:45:53 +05:30
Rohit Waghchaure
4178030c99 [Fix] Patch 2018-06-29 17:54:25 +05:30
Nabin Hait
b192a4af77 reload doc in patch 2018-06-29 15:30:41 +05:30
Nabin Hait
6e86fb2540 Set user permissions for new departments based on company 2018-06-29 14:36:45 +05:30
Nabin Hait
c114ceb67d Set salary component properties in existing components and salary structures 2018-06-29 14:36:45 +05:30
Ranjith Kurungadam
5f7c7bfc78 remove patch to add hra fields (#14552) 2018-06-18 15:43:45 +05:30
Ranjith Kurungadam
28f49a5a8e fix - link validation error (#14547) 2018-06-18 10:40:23 +05:30
rohitwaghchaure
e647c1f3cb Renamed asset adjustment to asset value adjustment (#14532) 2018-06-15 13:06:28 +05:30
Ranjith Kurungadam
a8e047afc8 HRA tax exemption Indian regional (#14520)
* remove HRA fields fom declaration, proof submission

* HRA fields, methods India regional

* Company - remove Payroll Settings

* HRA India regional, override methods

* Patch to add HRA fields for India
2018-06-14 17:56:16 +05:30
Shreya Shah
c3d1353ab5
Merge pull request #14518 from shreyashah115/patch-fix
Check if table exists else return
2018-06-14 13:08:49 +05:30
Shreya
df385ac3c0 Check if table exists else return 2018-06-14 13:07:52 +05:30
Zarrar
14a9c0706b
Merge pull request #14461 from mntechnique/sales_partner_type
Partner Type as Link field added in Sales Partner
2018-06-14 12:48:24 +05:30