Ameya Shenoy
b635a71247
Merge branch 'staging' into develop
2018-09-26 08:53:03 +00:00
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
Suraj Shetty
bfc195dd8b
Changes to support refactor in frappe pg-poc branch ( #15287 )
...
* Remove quotes from sql to make it compatible with postgres as well
* Fix queries
- Replace mysql specifc queries with standard ones
* Make repo URL chages to test pg-poc
* Add root passowrd to test site config
* Fix quotes issue
* Remove debug flag from a pricing rule query
* Remove python 3.6 version from travis.yml
* Fix improper query issue
* Fix incorrect query
* Fix a query
- This fix need to be changed when we will start supporting postgres
since date_format is not supported by postgres
* Get price list map as dict
* Convert price_list_currency_map to dict
2018-09-21 10:20:52 +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
Ameya Shenoy
18310c240f
fix(patch): delete hub documents
...
While deteting the "Data Migratun Plan" docs the patch used to break,
since it was linked to docs from "Data Migration Run". Modified the
patch to also delete the linked "Data Migration Run" docs.
2018-09-12 17:46:58 +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
84ddbc0ac9
fix(test): test cases fixed
2018-09-11 17:11:39 +05:30
Nabin Hait
2236f0aef0
fix(test): multiple test cases fixed
2018-09-11 16:50:46 +05:30
Zlash65
4b0e3741b2
job card patch use orm
2018-09-10 12:18:51 +05:30
Zarrar
68000c66fc
check if Data Migration Plan exists before deleting ( #15368 )
2018-09-09 19:19:13 +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
4fd1cebf95
fix(patch): Delete all documents from Hub Node module
2018-09-06 18:53:46 +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
Saurabh
5c3590fa8d
Merge branch 'master' into develop
2018-08-31 11:29:14 +05:30
Charles-Henri Decultot
7e86d7b014
Add default payable account for expense claims ( #15246 )
2018-08-30 19:18:26 +05:30
Shreya Shah
3df2639a32
Optimize patch ( #15263 )
2018-08-30 17:24:03 +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
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
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
