Commit Graph

969 Commits

Author SHA1 Message Date
Saif Ur Rehman
1a441b267d Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
#	erpnext/patches.txt
2019-02-01 19:17:04 +05:00
Saurabh
a342138625 Merge branch 'master' into develop 2019-01-30 12:38:58 +05:30
Saurabh
5c12490709 fix: patch to add guardian role if not exists 2019-01-30 11:52:53 +05:30
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +05:30
Sagar Vora
f3cfad7595 Merge branch 'master' into staging-fixes 2019-01-29 17:20:46 +05:30
Saif Ur Rehman
3d275af67b Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/customer/customer.json
2019-01-24 23:40:16 +05:00
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
Suraj Shetty
41b3756df5 fix: patch to replace Project icon with Projects icon (#16374)
* Delete duplicate projects icon from desktop.py

* Fix patch (to replace project to projects)
2019-01-24 10:57:05 +05:30
Sagar Vora
f51661b225 fix: allow operators, make weighting_function mandatory 2019-01-23 16:42:28 +05:30
Saif Ur Rehman
74a3370095 Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/sales_order/sales_order.json
2019-01-22 16:20:40 +05:00
Sagar Vora
4d1a9b10ed Merge branch 'staging' into develop 2019-01-22 15:56:39 +05:30
Sagar Vora
ceacacc320 Merge branch 'master' into staging-fixes 2019-01-22 15:37:05 +05:30
Nabin Hait
9adfd2d7b4
Merge pull request #16419 from rohitwaghchaure/project_update_status_code_and_design_refactoring
fix: Project update status feature's code and design refactored
2019-01-22 10:02:34 +05:30
Saif Ur Rehman
398f593e5f Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12
# Conflicts:
#	erpnext/patches.txt
2019-01-18 17:33:19 +05:00
Rohit Waghchaure
7e71e132a3 Added patch 2019-01-18 11:47:31 +05:30
Nabin Hait
bef2c22d23 Fix: merge conflict 2019-01-18 10:15:47 +05:30
Deepesh Garg
7bb7f95aa8
Merge branch 'staging-fixes' into company_address 2019-01-16 11:17:55 +05:30
Sagar Vora
876d868fa1 fix(tests): change patch order, optimise travis 2019-01-15 15:45:33 +05:30
Saurabh
68ea608ca8 fix: import unicode_literals 2019-01-15 14:47:32 +05:30
Himanshu
cccc78e197 fix: Qms icon color and label fix (#16293)
* qms color fix according to palette

* changed qms icon and color

* patch to change icon

* fix no module named v12_0

* removed spacing in desktop icon

* fix: line break

* renamed QM to Quality

* patch to rename quality management to quality

* resolve merge conflicts
2019-01-14 14:36:54 +05:30
Saif Ur Rehman
fc5c9b8ab8 chore: Move Item Tax Template patch to v12 2019-01-10 04:34:14 +05:00
Saif Ur Rehman
8d61794540 Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12
# Conflicts:
#	erpnext/patches.txt
#	erpnext/stock/doctype/item/item.json
2019-01-10 04:23:40 +05:00
Deepesh Garg
9c5e9d79f1
Merge branch 'staging-fixes' into company_address 2019-01-09 17:19:20 +05:30
deepeshgarg007
d29ee97307 Addition of GST fields in Sales Order,Purchase Order,Purchase Receipt 2019-01-09 17:09:11 +05:30
Saif Ur Rehman
eb7277d2d4 Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
# Conflicts:
#	erpnext/patches.txt
2019-01-09 11:25:53 +05:00
Saif Ur Rehman
848bbac05e Added patch for Item Tax Template 2019-01-07 05:32:38 +05:00
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
Suraj Shetty
3de12db2b1 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-27 09:05:25 +05:30
Suraj Shetty
9180c48262
Fix patch entry 2018-12-25 14:34:38 +05:30
Suraj Shetty
8d9960bdad Fix patch entry 2018-12-25 12:33:37 +05:30
Suraj Shetty
bcd8f31e43 Add an entry of a patch in patches.txt 2018-12-25 11:16:49 +05:30
Suraj Shetty
9c3dcfea76 Add a patch to rename accounts desktop icon to accounting 2018-12-24 17:00:40 +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
b58c317abb Fix daily_work_summary_settings migration patch 2018-12-24 10:26:39 +05:30
Suraj Shetty
b0a84f014e Replace desktop icon for project list with desktop icon for projects module
- Add a patch to fix already install instances
2018-12-20 20:12:37 +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
Rohan
f43433b43d fix(delivery): update package total on validate (#16131) 2018-12-10 17:47:31 +05:30
deepeshgarg007
4c79274054 Fixed patch and deprecated grid reports 2018-11-30 18:01:22 +05:30
deepeshgarg007
9cdece4ca2 Test case fix and other minor bug fix 2018-11-26 11:05:28 +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
Frappe Bot
88c88d6e7c Merge branch 'master' into staging-fixes 2018-11-13 10:59:05 +00:00
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
khushalti
fad08e1bcb [fix] - GL entry not creating on PR if rejected qty mentoned (#15815) 2018-11-13 12:09:32 +05:30
Deepesh Garg
6714214951 Server side script report for sales analytics (#15589)
* Sales Analytics Report

* Codacy issue fixes and  name column addition

* Minor Fixes

* Minor Changes

* Codacy Issue Fixes

* Codacy Issue Fixes

* Bug Fixes

* Code cleaning and optimization

* Deleted Duplicate code

* Indentation Issue Fixes

* Added Supplier Condition

* Cleaned code and better function naming

* Added report link for sales analytics in selling.py

* fix(patch): Patch to delete old analytics reports

* feat(refactor): Created class and refactored code using object oriented paradigm

* Column condition fix

* Minor condition fix

* Minor fix

* parent child map for purchase analytics

* Minor Fixes in get_periodic_data

* Used dots for filters instead of brackets

* Minor Bug fix in get_period_date_ranges

* Test Cases for Analytics Report
2018-11-12 16:15:54 +05:30
Nabin Hait
3c29967d27 Fixed merge conflict 2018-10-15 15:43:21 +05:30
rohitwaghchaure
94fcb0e9f9 [Enhance] Add user image in the employee from the user (#15680) 2018-10-15 14:57:46 +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
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
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
Prateeksha Singh
5ba14fe685 [patch][fix] remove hub node module removing code 2018-09-12 16:59:17 +05:30
Nabin Hait
9fde97cdd2 Fixed merge conflict 2018-09-12 15:45:20 +05:30
Saurabh
393dd4286a [resolved] merge-conflicts 2018-09-12 14:48:30 +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
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
4fd1cebf95 fix(patch): Delete all documents from Hub Node module 2018-09-06 18:53:46 +05:30
Faris Ansari
4e372a30fa fix(patch): Remove old Hub Page (#15328) 2018-09-06 14:08:31 +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
Prateeksha Singh
adef70f8df [hub] update_hub_url patch to use marketplace_url 2018-09-03 16:12:50 +05:30
Jamsheer
fd2879c077 Patch - Healthcare - Redesign Billing 2018-09-03 11:26:16 +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
Prateeksha Singh
5797565dd0 Merge with upstream 2018-08-30 16:15:27 +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
Nabin Hait
a804d6d487 Fixed merge conflict 2018-08-29 13:34:58 +05:30
Prateeksha Singh
bd7d964848 [hub] Merge Develop 2018-08-28 18:25:07 +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
1898e11585 patch sequence fix 2018-08-28 13:04:40 +05:30
Saurabh
51570f731c [Fix] patch fixes for V11 migration 2018-08-27 17:00:51 +05:30
rohitwaghchaure
8cca61f1ba [Fix] Removed roles for Eway bill report (#15157) 2018-08-20 17:53:56 +05:30
rohitwaghchaure
ecc6af9d2a [Fix] Total materials consumed cost not consider in the calculation of Gross Margin in project (#15171) 2018-08-20 17:39:54 +05:30
Shreya Shah
0631aed3d9 Discount amount field in all transactions' child tables (#15124)
* Add discount_amount and base_discount_amount in Sales Invoice Item

* Add patch for existing documents

* Discount amount field in all child tables of Purchase and Selling

* Remove console statements
2018-08-14 10:51:48 +05:30
Nabin Hait
06029194cb Patch fixes 2018-07-31 18:16:11 +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
Faris Ansari
9d1b7d493a [patch] Delete old hub page 2018-07-26 18:54:58 +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
d7897f1c53 Resolved merge conflicts 2018-07-18 17:08:16 +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
Suraj Shetty
a6f984366a
Fix typo 2018-07-16 18:39:01 +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
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
Nabin Hait
03b597418a Patch order fixed 2018-07-13 17:45:27 +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
Nabin Hait
da17ceea73 patch fixes 2018-07-13 12:04:06 +05:30
rohitwaghchaure
cc9c7d5e2a [Fix] GSTIN not displaying in the address print (#14855)
* [Fix] GSTIN not displaying in the address print

* Made changes in the patch and set Patch as False

* Update update_address_template_for_india.py
2018-07-10 15:41:42 +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
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
Nabin Hait
6e86fb2540 Set user permissions for new departments based on company 2018-06-29 14:36:45 +05:30
Shreya Shah
77de8dc102 Change Restaurant icon type to module (#14578) 2018-06-19 10:43:08 +05:30
Ranjith Kurungadam
5f7c7bfc78 remove patch to add hra fields (#14552) 2018-06-18 15:43:45 +05:30
rohitwaghchaure
e647c1f3cb Renamed asset adjustment to asset value adjustment (#14532) 2018-06-15 13:06:28 +05:30