Doridel Cahanap
ad76f9ad70
[Enhancement] Work Order Material Consumption ( #13384 )
...
* Work Order Material Consumption
* Test cases and other minor fixes
* Test cases fixes
* Travis Fixes
* Work Order Material Consumption Request Changes
* Update work_order.js
2018-04-09 10:31:28 +05:30
Sathisha Poojary
99e3ca0f67
Create a new doctype for bank so that we can suport other
...
bank statements dynamically.
2018-04-07 19:00:05 +05:30
Sathisha Poojary
6b8eb645c4
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2018-04-07 16:41:43 +05:30
Nabin Hait
e9638be032
fixed merge conflict
2018-04-06 15:18:27 +05:30
Nabin Hait
f92fcdbac4
Merge branch 'hotfix'
2018-04-06 15:06:09 +05:30
Nabin Hait
1ff9e0432a
bumped to version 10.1.20
2018-04-06 15:36:09 +06:00
rohitwaghchaure
c0f149a3be
[Fix] Delivery notification for delivery trip ( #13543 )
2018-04-06 14:26:26 +05:30
Dominik Ottenbreit
82eac06505
Add Order Confirmation to PO ( #13421 )
2018-04-06 11:51:18 +05:30
rohitwaghchaure
2ae6cfda5f
[Fix] Item variant details report ( #13545 )
2018-04-06 11:49:04 +05:30
KanchanChauhan
4691af6348
Get Payment Schedule from Sales Order to Sales Invoice ( #13497 )
2018-04-06 11:23:19 +05:30
Kenneth Sequeira
2d79e46fbd
updated images for print format ( #13498 )
2018-04-06 11:22:37 +05:30
Jamsheer
86fd8cbf68
Healthcare dashboard ( #13533 )
...
* Healthcare Dashboards
* Lab Test and Template - field marked in_filter = True
2018-04-06 10:29:23 +05:30
rohitwaghchaure
22d9f0a4aa
[Fix] Bin not deleted on delete of an item ( #13539 )
2018-04-06 10:29:07 +05:30
Saurabh
b0e409d4a8
syntax fix ( #13542 )
2018-04-06 10:28:40 +05:30
Rushabh Mehta
dccfb54a0f
[fix] [ux] allow account to be created via form ( #13509 )
2018-04-06 10:28:08 +05:30
Zarrar
92109b01fd
translate while creating items from user progress ( #13530 )
2018-04-06 10:27:55 +05:30
Manas Solanki
76cbf0a044
Merge pull request #13544 from frappe/manassolanki-patch-4
...
Update setup.py
2018-04-05 21:36:01 +05:30
Manas Solanki
b2f9af71d2
Update setup.py
2018-04-05 21:35:29 +05:30
Pawan Mehta
f41963536e
Group email fields together and add IFSC Code ( #13535 )
...
* [fix] #13534
* change field order cell no
2018-04-05 14:54:51 +05:30
Prateeksha Singh
59147c0368
Merge pull request #13538 from pratu16x7/hub-fixes
...
[fix] company listing context
2018-04-05 14:53:11 +05:30
Prateeksha Singh
4b7dcfad54
[hub] add hub settings access regardless
2018-04-05 14:50:42 +05:30
Prateeksha Singh
420c79041e
[fix] company listing context
2018-04-05 14:44:16 +05:30
Suraj Shetty
97d84eb509
remove apply user permission ( #13505 )
2018-04-05 12:10:46 +05:30
Zarrar
0e3b000e81
sql syntax fix ( #13529 )
2018-04-05 10:34:30 +05:30
rohitwaghchaure
d77e8e5b02
Merge pull request #13521 from rohitwaghchaure/pos_freeze_when_change_rate
...
[Fix] POS freeze when rate button pushed
2018-04-04 18:10:12 +05:30
Rohit Waghchaure
920a3ff0b8
[Fix] POS freeze when rate button pushed
2018-04-04 18:06:19 +05:30
rohitwaghchaure
aa7cddef5c
Merge pull request #13511 from rohitwaghchaure/table_styling
...
[Fix] Width and margin for account receivable pdc print format
2018-04-04 16:34:21 +05:30
Rohit Waghchaure
3d2b3d37d4
[Fix] Width and margin for account receivable pdc print format
2018-04-04 16:01:33 +05:30
Nabin Hait
2b682c82e8
Fixed merge conflict
2018-04-04 11:40:16 +05:30
Nabin Hait
821222653b
Merge branch 'hotfix'
2018-04-04 11:26:19 +05:30
Nabin Hait
adddb15380
bumped to version 10.1.19
2018-04-04 11:56:19 +06:00
Nabin Hait
5fd79f7f77
Update stock_ledger.py
2018-04-04 11:20:16 +05:30
Vishal Dhayagude
2505c74d64
Place of Supply set on save Delivery Note if Customer Address Present ( #13492 )
2018-04-04 11:05:21 +05:30
Achilles Rasquinha
ecfc10e21c
Merge pull request #13500 from frappe-pr-bot/translations-2018-04-03
...
[Translation] Updated Translations
2018-04-03 19:32:43 +05:30
frappe-pr-bot
6623cdc244
[Translation] Updated Translations
2018-04-03 15:49:16 +02:00
Vinayak Jethe
df83148d7c
Woocommerce Integration ( #13217 )
...
* WIP for WooCommerce Integration
* WIP for WooComm Integration
* WIP WooComm
* Added Woocommerce Settings
* Woocommerce Settings
Enable Sync Makes fields mandatory
* Woocommerce whitelisted endpoints
* [Clean Up] Woocommerce Settings
* Verify Webhook Data
* Fix Verify Webhook
* WIP WooComm
* WIP and working few modules
* Customer creating partially
* Customer creation successful
* Refactored Customer code
* WIP Address
* Fixed address and customer bug. Now working fine
* WIP for products. Creation of items successful
* Handling json for product
* Products creating and updating properly
* Custom checkbox for required doctypes
* Product feature fully completed
* WIP orders
* Sales order working properly
* Orders mapping successfully
* New version Customer Working Properly
* Items creation properly
* Working on sales order
* Orders comming successfully
* Bug fixes
* Fixed date format for delivery date
* Code Cleanup
* Woo setting page modified
* Fixed minor bug
* Fixes
* Minimum Viable Product
* Cleanup
* Removed duplicate file from erpnext config
* Added more default changes to woo settings
* Fixes as per required
* Fixes
* Bug fix
* few changes and fix
* Fixing
* Fixes with test
* Added Test for Woocommerce - Emulates request
* Fix woocommerce test
* fix woocommerce test
* verify_request: py3 ready
* Codacy fixes
* WooCommerce Integration Docs
* Codacy changes
* Codacy fixes
* User set tax account
* Fixes for account
* Fix for warehouse issue
* Docs updated
* Codacy fix
* Updated Docs
* Minor changes
* Tested added for repeat order and cleanup
* Minor change
* docs and gifs renamed according to convention
* Doc updated
2018-04-03 11:17:03 +05:30
Prateeksha Singh
b60a52b194
Hub Market ( #13325 )
...
* [hub] enable hub with OAuth token from user's client ID
* [hub] settings schema for adding users
* [hub] image view style listing
* [hub] broken image link fallback
* [wip]
* [hub] bootstrap timeline
* [hub] setup quick view
* [hub] reformat ratings, add companies autocomplete filter
* [hub] common listing frames
* [hub] setup sort selector
* [hub] timeline
* [hub] customize list header
* [hub] genuine form fieldtypes
* [hub] review products
* [hub] suggest missing categories remotely
* [hub] Wishlist; header and title templates
* [hub] link wishlist, remove company migration
* [hub] calculate ratings
2018-04-03 10:44:13 +05:30
Suraj Shetty
c5effbf009
Data export tool doc ( #13419 )
...
* data export tool docs
* change doc gif path
2018-04-03 10:43:08 +05:30
Frappe PR Bot
dc0a92c8de
updated translations ( #13485 )
2018-04-02 23:46:54 +05:30
Rushabh Mehta
d5f9ebd008
[optimize] item queries ( #13480 )
2018-04-02 23:37:33 +05:30
Achilles Rasquinha
325ce05044
Merge pull request #13475 from rohitwaghchaure/fixed_travis
...
[Fix] Travis
2018-04-02 17:02:39 +05:30
Rohit Waghchaure
395d61b998
[Fix] Travis
2018-04-02 15:11:47 +05:30
rohitwaghchaure
eedc0ac681
[Fix] chart of accounts root type is mandatory issue in charts.erpnext.com ( #13467 )
2018-04-02 12:49:38 +05:30
Britlog
220864b4f7
Allow decimal quantities in pos ( #13471 )
2018-04-02 10:55:04 +05:30
Charles-Henri Decultot
6860036b01
Agriculture module corrections ( #13438 )
...
* Agriculture module corrections
* Update ternary_plot.js
2018-04-02 10:51:53 +05:30
Nabin Hait
c825e914d1
Added indexes for lft, rgt on nestedset doctypes ( #13420 )
2018-04-02 10:43:46 +05:30
Shreya Shah
d021e45301
exclude current doc while validating ( #13450 )
2018-04-02 10:43:19 +05:30
Zarrar
e9ca5e81d2
hide add_child for root node ( #13444 )
2018-04-02 10:40:39 +05:30
Shreya Shah
5d71609f0b
Timer fixes ( #13443 )
...
* alert for exceeded time only when dialog is open
* fetch row having an activity without from_time
* fixes if timesheet created from work order
* reset timer limit exceeded
2018-04-02 10:32:39 +05:30
Manas Solanki
a7f5589564
fix for the update button in the sales invoice ( #13435 )
2018-04-02 10:32:00 +05:30