Manas Solanki
df0ffab16c
Merge pull request #14093 from manassolanki/poc-fixes-1
...
[ui] more fields in the list view of assets
2018-05-16 18:25:37 +05:30
Manas Solanki
f3f1ba37b9
[ui] more fields in the list view of assets
2018-05-16 18:24:35 +05:30
rohitwaghchaure
4ea97c84ac
Merge pull request #14092 from rohitwaghchaure/enterprise_develop_asset_fixes_for_perpetual
...
[Fix] Asset gl entry not creating for non perpetual
2018-05-16 18:21:20 +05:30
Rohit Waghchaure
421697250b
[Fix] Asset gl entry not creating for non perpetual
2018-05-16 18:20:52 +05:30
Manas Solanki
2684593af0
Merge pull request #14091 from manassolanki/poc-fixes-1
...
Added the travel request on the config page
2018-05-16 18:10:57 +05:30
Manas Solanki
5b34c00ba6
Added the travel request on the config page
2018-05-16 18:09:43 +05:30
Manas Solanki
fa57cdd86d
Merge pull request #14090 from manassolanki/poc-fixes
...
create item default on making of invoice
2018-05-16 17:46:53 +05:30
Manas Solanki
5b93562ce3
create default on making of invoice
2018-05-16 17:44:51 +05:30
rohitwaghchaure
19a2260ce7
Merge pull request #14089 from shreyashah115/fixes
...
[Fix] General Ledger report filters error
2018-05-16 17:41:19 +05:30
Shreya
63d14cfac8
Instead of throwing error, just return
2018-05-16 17:30:58 +05:30
Shreya
df9516e906
Add Finance Book to route options
2018-05-16 17:30:35 +05:30
Manas Solanki
efae732370
Merge pull request #14088 from manassolanki/item-fixes
...
more fixes for the item defaults
2018-05-16 17:16:25 +05:30
Manas Solanki
e3bb1d0e3b
more fixes for the item defaults
2018-05-16 17:14:59 +05:30
rohitwaghchaure
64076730a1
Merge pull request #14087 from manassolanki/item-fixes
...
return defaults according to the company
2018-05-16 17:02:32 +05:30
Manas Solanki
38667ab8da
return defaults according to the company
2018-05-16 17:00:05 +05:30
rohitwaghchaure
adc5b128b6
Merge pull request #14086 from rohitwaghchaure/multiple_fixes
...
Multiple fixes
2018-05-16 16:42:25 +05:30
Rohit Waghchaure
b233e9d643
[Fix] Multiple fixes
2018-05-16 16:41:34 +05:30
Manas Solanki
028e2ad246
Merge pull request #14083 from frappe/codingCoffee-patch-3
...
spaces to tabs
2018-05-16 16:25:25 +05:30
rohitwaghchaure
de796266f2
Merge pull request #14084 from shreyashah115/fixes
...
[minor] Fix error
2018-05-16 16:21:14 +05:30
rohitwaghchaure
9c0a87e804
Merge pull request #14082 from manassolanki/item-fixes
...
[fixes] fix in the item defaults
2018-05-16 16:19:39 +05:30
Manas Solanki
e3910fb2a6
[fixes] fix in the item defaults
2018-05-16 16:16:34 +05:30
Shreya
fda15702bc
Fix error
2018-05-16 16:14:34 +05:30
Ameya Shenoy
6e92958578
spaces to tabs
2018-05-16 16:11:20 +05:30
rohitwaghchaure
a7559be5b2
Merge pull request #14080 from rohitwaghchaure/po_pi_issue
...
[Fix] 'PurchaseInvoiceItem' object has no attribute 'company'
2018-05-16 15:42:53 +05:30
Rohit Waghchaure
23942701f1
[Fix] 'PurchaseInvoiceItem' object has no attribute 'company'
2018-05-16 15:41:00 +05:30
Manas Solanki
8e184569a1
Update item.json
2018-05-16 15:11:52 +05:30
rohitwaghchaure
9122f19e69
Merge pull request #14079 from saurabh6790/TDS_sprint
...
[fix] calculate withholding only on invoice
2018-05-16 15:01:46 +05:30
Saurabh
3c204122cd
[fix] calculate withholding only on invoice
2018-05-16 15:00:19 +05:30
Manas Solanki
4534df36a9
Merge pull request #14078 from manassolanki/pos-fix
...
[enterprise] minor fixes
2018-05-16 14:53:21 +05:30
Manas Solanki
4256a34220
[enterprise] minor fixes
...
make the employee name mandatory in the employee onboarding
added the retention bonus amount
2018-05-16 14:51:25 +05:30
Manas Solanki
9b53b93e37
Merge pull request #14077 from manassolanki/travel-request
...
[rename] Photo ID -> Identification Document
2018-05-16 14:13:13 +05:30
Manas Solanki
6eb7f346bd
[rename] Photo ID -> Identification Document
2018-05-16 14:12:22 +05:30
rohitwaghchaure
9ad0ac9557
Merge pull request #14068 from manassolanki/travel-request
...
[feature] added travel request doctype in HR
2018-05-16 14:05:26 +05:30
rohitwaghchaure
eff678d2d6
Merge pull request #13918 from manassolanki/item-level-defualts
...
[enhancement] add the item defaults in the child-table for multi-company
2018-05-16 14:04:47 +05:30
Suraj Shetty
fbb6b3da5f
Undo replace of frappe.db.sql with frappe.get_list ( #14074 )
2018-05-16 13:53:31 +05:30
lasalesi
265005d30d
apply sorting for make multiple variant attributes ( #14073 )
2018-05-16 13:10:25 +05:30
Ranjith Kurungadam
cdd4704485
Fixes, fields in Salary Component ( #14071 )
...
* remove duplicate fields
* Salary Component - fields is_tax_applicable, is_payable
* fix intendation
2018-05-16 13:10:08 +05:30
Rushabh Mehta
e07b332514
fix for tests
2018-05-16 13:05:13 +05:30
Manas Solanki
64614374d8
fix codacy
2018-05-16 13:00:56 +05:30
Manas Solanki
bbd8508783
optimize the patch
2018-05-16 13:00:56 +05:30
Manas Solanki
b16a4ec79e
changes for the default cost center
2018-05-16 13:00:56 +05:30
Rushabh Mehta
0b628386de
[minor] remove in_dialog old property
2018-05-16 12:51:22 +05:30
Manas Solanki
087a2259d9
update for default warehouse
2018-05-16 12:44:07 +05:30
Manas Solanki
c760222a6c
add the item defaults in the childtable for multicompany
2018-05-16 12:44:06 +05:30
rohitwaghchaure
778841f399
Merge pull request #14072 from rohitwaghchaure/on_hold_issue
...
[Fix] 'Supplier' object has no attribute 'on_hold'
2018-05-16 12:26:33 +05:30
Rohit Waghchaure
909069fa20
[Fix] 'Supplier' object has no attribute 'on_hold'
2018-05-16 12:25:51 +05:30
rohitwaghchaure
b13a4480db
Merge pull request #14070 from rohitwaghchaure/budget_validation_project_condition
...
Added project condition in budget validation
2018-05-16 12:19:31 +05:30
Rohit Waghchaure
144e9b178a
Added project condition in budget validation
2018-05-16 12:15:57 +05:30
Rushabh Mehta
b56f3d0689
[fix] syntax errors
2018-05-16 12:03:39 +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
