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
Nabin Hait
ed376cacc8
Set Qty in transactions based on serial no via Stock Settings ( #13897 )
2018-05-03 16:24:52 +05:30
rohitwaghchaure
125c0caf12
Added brand in item price doctype, item prices report ( #13900 )
2018-05-03 16:23:57 +05:30
Nabin Hait
3652a62b55
minor fixes
2018-04-30 19:32:29 +05:30
Nabin Hait
d39386bd55
Renamed some salary related fields
2018-04-30 16:21:37 +05:30
rohitwaghchaure
efff6e53de
Consolidated financial statement ( #13678 )
...
* added fields to support treeview
* tree file added, nestedset implemented
* patch added to reload doc and configure lft rgt
* Added consolidated financial statement report
2018-04-26 12:16:18 +05:30
Nabin Hait
8076d6ddc8
Renamed Health Insurance to Employee Health Insurance
2018-04-26 12:16:17 +05:30
Nabin Hait
265426a5a6
Minor fixes
2018-04-26 12:14:02 +05:30
Nabin Hait
81706fdb46
Update rename_field_max_days_allowed.py
2018-04-26 12:14:02 +05:30
Nabin Hait
551844881b
Removed employee table from Salary Structure and added employee name in all forms
2018-04-26 12:14:01 +05:30
Shreya Shah
b15ef8450f
[Enterprise] Patch and child table changes ( #13656 )
...
* [patch] rename field
* Employee Property History child table
* remove child tables
2018-04-26 12:13:06 +05:30
Rushabh Mehta
369afce43c
[patch] ignore validations while creating custom fields for gst via patch
2018-04-26 10:10:03 +05:30
Saurabh
1d5bbe1081
Merge branch 'master' into develop
2018-04-25 12:46:50 +05:30
Rohit Waghchaure
bf416cfbf8
[Fix] POS Patch
2018-04-25 12:32:22 +05:30
Saurabh
63590496c1
[fix] resolved merge conflicts
2018-04-25 11:32:54 +05:30
rohitwaghchaure
57914f140e
[HotFix] Taxes not adding in POS sales invoice ( #13776 )
2018-04-24 19:19:47 +05:30
Nabin Hait
5643c3ead2
Minor fix in reloading email template
2018-04-24 17:51:13 +05:30
