Commit Graph

2093 Commits

Author SHA1 Message Date
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
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
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
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
Nabin Hait
d0c6184e24 minor patch fixes 2018-06-28 23:42:55 +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
Shreya Shah
a2056a39bd Fix patch (#14503)
* Modify patch to move leave approvers from Employee master to Department master

* Rename child table names

- Rename leave approver to leave approvers
- Rename expense approver to expense approvers

* Import cstr

* Fix a condition
2018-06-13 17:11:17 +05:30
deepak-mnt
b95f60c6f3 minor changes 2018-06-12 16:04:49 +05:30
Rohit Waghchaure
ec2a2ac47e [Fix] patch 2018-06-12 01:16:28 +05:30
Shreya Shah
157815ff0c Patch for total quantity (#14458)
* Add path to patches.txt

* Modify patch
2018-06-11 17:32:17 +05:30
deepak-mnt
4ec283d775 patch for sales partner type field 2018-06-11 14:53:25 +05:30
Zarrar
65994210f6 fix patch to add email template in hr settings (#14427) 2018-06-08 16:57:06 +05:30
Suraj Shetty
f553b53fbf Add patch to set update_field and update_value (#14421)
* Add patch to set update_field and update_value

- set update_field and update_value if empty
since expense claim workflow is dependent on it.

* Set update_field for workflow state of leave application

* Update patch entry

* Fix bug

* Update set_update_field_and_value_in_workflow_state.py
2018-06-08 16:28:36 +05:30
Gaurav Naik
094617d29a Fix to allow migration of individual sites (#14413) 2018-06-08 11:44:27 +05:30
Zarrar
209d8f36f7 doctype was not reloaded to pickup changes (#14371) 2018-06-07 16:43:55 +05:30
Shreya Shah
59af3a0296 [Enhancement] UOM Conversion Factors (#13853)
* new doctype UOM category

* new doctype UOM Conversion Factor

* bootstrap json data for uom conversions

* uom conversion in item

* Patch to add all conversions and categories

* Fetch conversions multi-way

* fix codacy

* Rebase with develop

* [minor] Fix

* Add a test case

* Improvise as per review comment

* Add json data for UOMs

* Commonify function and call from patch

* Update uom_conversion_data.py
2018-06-06 09:44:46 +05:30
Nabin Hait
2f273e73b2 minor fixes 2018-06-05 14:40:48 +05:30
rohitwaghchaure
2da6b3d628 [enhance] Provision to backflush raw materials based on stock entries for subcontracted items (#14296) 2018-06-05 13:06:52 +05:30
Shreya Shah
4fa600a8dd Apply GST based on Origin and Place of supply GST Code (#14288)
* Add new gst field in Taxes and Charges template - is_inter_state

* Add a patch

* Add a regional function to fetch taxes on the basis of GSTin

* Add regional function to hooks.py

* Fetch taxes for Purchase Invoice on the basis of Supplier GSTIN

* Fixes in the setup.py for India region

* Set is_inter_state field

For the existing Taxes and Charges templates, if an account_head with igst account (which is set in GST Settings) is found, set the checkbox and also check if it doesn't have a cgst account.

* Fix as per review comment
2018-06-05 11:27:53 +05:30
Shreya Shah
f1e54836cb Remove hardcoded workflow patches (#14340) 2018-06-05 10:35:07 +05:30
Prateeksha Singh
2141bfab89 [patch][update] naming_series field in member patch 2018-06-04 16:36:12 +05:30
Prateeksha Singh
37678d4838 [patch][new] rename old members as per naming series (#14339) 2018-06-04 14:25:51 +05:30
Saurabh
0eb622f7da [fix] resolve conflicts 2018-05-31 17:32:17 +05:30
rohitwaghchaure
05152dad0b [Enhance] Provision to set overproduction percentage for work order (#14248) 2018-05-30 15:28:09 +05:30
Nabin Hait
348a6a8b17 patch fixes 2018-05-29 16:17:15 +05:30
Nabin Hait
4d0c73a5c8 Submit auto created salary structure assignments 2018-05-29 13:25:28 +05:30
Nabin Hait
3aa205f19d Fixes related to department tree 2018-05-29 13:08:48 +05:30
Saurabh
d3a8c9308b [fix] add ignore validate flag (#14238) 2018-05-29 13:07:27 +05:30
Shreya Shah
ae95a8aa15 Update status in Purchase Receipt (#14257)
* Update status on submission if per_billed = 100

* Add patch to update existing records
2018-05-28 18:24:28 +05:30
rohitwaghchaure
30c88fe1a5
Merge pull request #14247 from rohitwaghchaure/patch_fixed_for_asset_warehouse
Fixed patch, checked warehouse available in the asset
2018-05-28 12:30:55 +05:30
Rohit Waghchaure
ad184f62e3 Fixed patch, checked warehouse available in the asset 2018-05-28 12:29:42 +05:30
Shreya Shah
e329038aaa Total Quantity in Sales and Purchase DocTypes (#14114)
* Add  field to all sales and purchase doctypes

* Add patch to update existing records

* Modify taxes_and_totals.py
2018-05-28 11:49:08 +05:30
Zarrar
ea064d4c5c module import fix in patch (#14203) 2018-05-24 15:54:48 +05:30
Nabin Hait
46600406b8
Update rename_field_max_days_allowed.py 2018-05-23 13:12:24 +05:30
Faris Ansari
26eb513274 Rename occurences of max_days_allowed to max_continuous allowed (#14180) 2018-05-23 10:31:39 +05:30
Faris Ansari
83149644e3
Merge pull request #14160 from shreyashah115/patches-fixes-travis
Fix patches for Travis
2018-05-22 15:26:49 +05:30
Faris Ansari
7a5221bd95
Add rename_field 2018-05-22 15:26:21 +05:30
Rohit Waghchaure
8e12a59d9b [Fix] Patch 2018-05-21 18:52:07 +05:30
rohitwaghchaure
3ec43966da
Merge pull request #14170 from codingCoffee/sal
salary structure patch run if active employee
2018-05-21 18:39:10 +05:30
Ameya Shenoy
a7d402132f salary structure patch run if active employee 2018-05-21 18:38:18 +05:30
rohitwaghchaure
734b874f3e
Merge pull request #14166 from rohitwaghchaure/version_11_patch_budget
[Fix] Patch, default cost center, expense account for the item
2018-05-21 17:18:58 +05:30
Faris Ansari
d2b4ec5044 [fix] Set null values to '0' before changing column type 2018-05-21 16:55:31 +05:30
Zlash65
004bf218a0 remove changes for max_days_allowed patch 2018-05-21 16:52:08 +05:30
Rohit Waghchaure
0ca7ba3247 [Fix] Patch, default cost center, expense account for the item 2018-05-21 16:43:50 +05:30
Zlash65
41cb6cc491 patch fix - skip query if no when_then case 2018-05-21 15:10:06 +05:30
Shreya
70f9d07df8 Fix patches for Travis 2018-05-21 15:04:13 +05:30
Faris Ansari
6d2dfac44e [fix][patch] Shopify (#14159) 2018-05-21 14:41:11 +05:30
Manas Solanki
d976c04b69
Merge pull request #14134 from manassolanki/fix-salary-patch
[fix] patch for the salary structure assignment for old employees
2018-05-18 15:47:14 +05:30
Manas Solanki
33c1a38dc8 [fix] patch for the salary structure assignment for old employees 2018-05-18 15:46:35 +05:30
Shreya
362e0a9f6e Fix patch 2018-05-17 15:43:03 +05:30
Manas Solanki
bbd8508783 optimize the patch 2018-05-16 13:00:56 +05:30
Manas Solanki
c760222a6c add the item defaults in the childtable for multicompany 2018-05-16 12:44:06 +05:30
Saurabh
d60c0f2292 Refactor shopify (#13588)
* move shopify settings to ERPNext

* [fix] setup webhook for order and validate webhook request

* validate webhook request

* sync customer and item if not exists while syncing order from shopify

* pull item from shopify and minor fixes

* fix method naming, mechanisim to register and withdraw webhooks, patch

* minor fix

* minor fixes

* [Patch][fix] use remove_from_installed_apps instead of remove app

* log exceptions

* add shopify logging for failed requests

* minor fixes

* fix test case

* codecy fixes

* check shared secret exists

* Test Case fixes

* UX fixes and patch fixes

* Documentation

* fixes

* [fix] dump webhooks request data into doctype

* Provision to resync the order if error occured in sync

* [fix] set default host
2018-05-16 11:33:47 +05:30
Shreya Shah
1906cadd94 [Fix] Currency field in Pricing rule (#14004)
* some minor changes

* Set query for price list based on currency

* Validate Price list with currency
2018-05-16 11:20:30 +05:30
rohitwaghchaure
e8358f33a3 Refactor party type (#13831) 2018-05-16 11:02:26 +05:30
Jamsheer
0cde6ae3c5 Clinical procedure (#13540)
* Clinical Procesdure Template and Clinical Procedure Doctype

* Consultation - Create procedure and procedure prescription

* Patient Appointment - Create Procedure and Procedure appointment invoice

* Physician Schedule - Validate slot overlap

* Clinical Procedure Item - batch_no for Clinical Procedure not for Template

* Clinical Procedure - manage item batch_no

* Codacy - fixes

* Yet another Codacy and travic-ci fix

* Codacy - fixes

* Clinical Procedure - Codacy fix

* Permissions updated

* fixed Qty Indicators, Minor fixes

* Patient appointment for procedure prescription

* Doctype Patient Service Unit to Healthcare Service Unit

* Add healthcare service unit tree root

* Healthcare Service Unit - Tree view script

* Healthcare Service Unit - allow appointments check

* Clinical Procedure - remove unused variable

* Clinical Procedure - Get actual quantity from ledger - fix

* Clinical Procedure - apply transilation for message

* Warehouse in Healthcare Service Unit

* Service Unit in Clinical Procedure

* Codacy fix

* Missing semicolon
2018-05-16 10:54:00 +05:30
rohitwaghchaure
c3b9eabe5e
Merge pull request #14048 from shreyashah115/exchange-rate
[Enhancement] Buying and Selling checkboxes in Currency Exchange
2018-05-15 17:55:09 +05:30
Shreya
acc4ceceb7 Add Patch to update existing records 2018-05-15 17:54:10 +05:30
Saurabh
ac2692711b Merge branch 'master' into develop 2018-05-15 14:59:38 +05:30
Saurabh
29160441bb [fix] if UOM and Warehouse link is invalid then set blank values 2018-05-15 14:56:18 +05:30
Zlash65
99e72af089 skip abbr, reload doc, disable edit for root department node' 2018-05-15 13:53:40 +05:30
Saurabh
d217fbaa45 [fix] reload Leave Period and Staffing Plan doctypes 2018-05-15 08:35:25 +05:30
Saurabh
2ca83d61ea Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
rohitwaghchaure
7c6bef4905
Merge branch 'enterprise_sprint' into supplier-group 2018-05-14 20:39:01 +05:30
Rohit Waghchaure
d644e6da16 Code cleanup 2018-05-14 19:09:44 +05:30
Rohit Waghchaure
11679884e4 Patch to move asset fields to Asset Finance Book table 2018-05-14 19:08:57 +05:30
Rohit Waghchaure
352df95976 Patch to make location 2018-05-14 19:08:56 +05:30
Zlash65
06fd51bf69 patch fix for instructor 2018-05-14 17:16:27 +05:30
Zlash65
d25a264e5b create and update department records patch 2018-05-14 16:07:28 +05:30
Zlash65
513f13df27 patch fix 2018-05-14 16:05:16 +05:30
Zlash65
c88ce364ce treeview implemented for supplier group 2018-05-14 11:45:38 +05:30
Zlash65
540d7aa635 patch to reload_doc and rename field 2018-05-14 11:45:38 +05:30
Nabin Hait
abd0325acd Fixed merge conflict 2018-05-05 12:19:14 +05:30
Suraj Shetty
00cced12a0 Success Action (#13666)
* success action config for  sales invoice

* remove "Notification Control" doctype and its usage

* add default success action after_install or while migration (patch)

* rename for_doctype to ref_doctype

* case change

* minor fix

* Remove unnecessary code

* Replace message with translatable message

* Fix 'cannot import error'
2018-05-03 19:06:32 +05:30
Saurabh
ed393d1025 [fix] consider user permissions in leave application calendar view (#13902)
* [fix] consider user permissions in leave application calendar view

* add hr settings to control leave calendar view

* add patch
2018-05-03 18:52:25 +05:30