Commit Graph

18799 Commits

Author SHA1 Message Date
Makarand Bauskar
cdfccffc0d Merge pull request #9341 from manassolanki/training-event
send email on update and on update after submit
2017-06-21 19:09:21 +05:30
Makarand Bauskar
7a2a2dad35 Merge pull request #9381 from almeidapaulopt/so_proj
link sales order to new project
2017-06-21 18:48:30 +05:30
Makarand Bauskar
a3f7823304 Merge pull request #9412 from umairsy/21jun
Updated help pages and removed old images, links to #9262
2017-06-21 18:34:45 +05:30
Umair Sayyed
5057098a19 Updated help pages and removed old images, links to #9262 2017-06-21 17:54:39 +05:30
Makarand Bauskar
ce7087f08a Merge pull request #9408 from mbauskar/develop
merged hotfix branch to develop
2017-06-21 16:41:33 +05:30
Makarand Bauskar
b37eb10421 Merge pull request #9382 from nick9822/nick9822-patch-1
Resetting batch and serial nos checks
2017-06-21 16:34:32 +05:30
mbauskar
196f3b1fb8 resolved merge conflicts 2017-06-21 14:38:06 +05:30
mbauskar
654ccb84f4 Merge branch 'hotfix' 2017-06-21 13:17:12 +05:30
mbauskar
9b4690995e bumped to version 8.0.51 2017-06-21 13:47:12 +06:00
Makarand Bauskar
2c67b01335 Merge pull request #9404 from mbauskar/hotfix
make quotation against lead company name (#9188)
2017-06-21 12:57:08 +05:30
Manas Solanki
29ba4143f9 make quotation against lead company name (#9188) 2017-06-21 12:55:27 +05:30
Makarand Bauskar
9b5d1fc458 Merge pull request #9401 from sagarvora/so-calendar
[fix] get status in calendar view and show green background
2017-06-21 12:41:27 +05:30
Makarand Bauskar
a9a03ab723 Merge pull request #9403 from manassolanki/issue-10
Trigger assessment plan every time page loads, fixes #9402
2017-06-21 12:37:40 +05:30
Manas Solanki
7f64f623f0 Trigger assessment plan every time page loads 2017-06-21 12:08:23 +05:30
Sagar Vora
6371b53b7e [fix] get status in calendar view and show green background 2017-06-21 11:58:29 +05:30
Makarand Bauskar
c7cfa16f8c Merge pull request #9391 from saurabh6790/fix_make_variant_item_code
[minor][fix] pass template item name to make_variant_item_code
2017-06-21 11:58:07 +05:30
Saurabh
8d269beb45 [minor][fix] pass template item name to make_variant_item_code 2017-06-20 20:14:14 +05:30
Makarand Bauskar
cd5dd890aa Merge pull request #9384 from nick9822/nick9822-patch-2
Bug while fetching stock balance of new item.
2017-06-20 19:52:28 +05:30
Makarand Bauskar
eb08cce825 Merge pull request #9386 from umairsy/20Jun
Replaced old images with new, links to #9262
2017-06-20 19:40:46 +05:30
Umair Sayyed
357cd6df90 added new images, links #9262 2017-06-20 18:19:50 +05:30
Umair Sayyed
3292e59dcd Replaced old images with new, links to #9262 2017-06-20 18:17:40 +05:30
nick9822
cc699a94fd Bug while fetching new item balance. 2017-06-20 17:13:29 +05:30
nick9822
43a48fd2bc Resetting batch and serial nos checks 2017-06-20 17:02:55 +05:30
Paulo Almeida
2d5e65ddcf link sales order to new project 2017-06-20 12:08:22 +01:00
Makarand Bauskar
d2301fc43d Merge pull request #9375 from frappe-pr-bot/translations-2017-06-20
[translation] translation update
2017-06-20 15:53:41 +05:30
frappe-pr-bot
db4bb720b8 [translation] translation updates 2017-06-20 11:22:36 +02:00
Makarand Bauskar
8fac4314aa Merge pull request #9373 from sagarvora/gh-9289
Check for align_labels_left before adding text-right class
2017-06-20 14:31:22 +05:30
Sagar Vora
89d60ca35e Check for align_labels_left before adding text-right class 2017-06-20 14:16:06 +05:30
Rushabh Mehta
17e6bb83eb [fix] typo, item group route to have parent only for non root 2017-06-20 14:07:33 +05:30
Makarand Bauskar
958b06b129 Merge pull request #9369 from sagarvora/gh-4559
[minor] calculate balance in company currency instead of account currency
2017-06-20 13:26:10 +05:30
Ayush Shukla
a111f78566 Leaderboard of customers, items, suppliers and sales partner (#9354)
* First commit leaderboard working

* Styling and added href

* Changed timeline string

* Changes in item

* Cleanup

* Fix

* made changes to currency column

* Code cleanup for codacy

* Sorting bug fixed and formatting done

* Changed type to isinstance
2017-06-20 13:04:45 +05:30
Vishal Dhayagude
310d4dc9e0 UOM column in Batch Wise Balance History Report (#9359)
* Training Events/Results link to employee dashbord

* [minor]Improve validation message for Buying / Selling Setting

* [minor]Added UOM cloumn in Batch Wise Balance History Report

* modified validation message for buying / selling setting
2017-06-20 13:02:35 +05:30
Britlog
faf75c4ddd Fix and improve shopping cart (#9348)
* Fix and improve shopping cart

* Update shopping_cart.js

* Update shopping_cart.js
2017-06-20 12:51:32 +05:30
Makarand Bauskar
22773a29f7 Merge pull request #9356 from tundebabzy/issue_6510
adds information about "Is Paid" and "Update Stock"
2017-06-20 12:04:16 +05:30
Sagar Vora
5b08d7acb3 [minor] calculate balance in company currency instead of account currency 2017-06-20 11:50:23 +05:30
Rushabh Mehta
80ef298519 [fix] [tests] test_delivery_note 2017-06-20 10:07:28 +05:30
Rushabh Mehta
36311020de [minor] ux fixes 2017-06-20 09:31:06 +05:30
tunde
4961072b51 adds the corrected breadcrumbs trail 2017-06-19 13:51:27 +01:00
Makarand Bauskar
9a5c39d329 Merge pull request #9353 from mbauskar/develop
[minor] Allow on Submit for Sales Order Customer PO and Customer PO Date
2017-06-19 18:16:22 +05:30
tunde
46db749d62 adds information about "Is Paid" and "Update Stock" 2017-06-19 09:18:57 +01:00
mbauskar
de5a11e8fb [minor] Allow on Submit for Sales Order Customer PO and Customer PO Date 2017-06-19 13:07:51 +05:30
Sagar Vora
086b6a33ea Fixed BOM value not updating on changing item (#9350) 2017-06-19 12:25:14 +05:30
Sagar Vora
67fe1010c7 [minor] set_posting_time=1 only when imported data contains posting date. (#9349) 2017-06-19 12:12:22 +05:30
Rushabh Mehta
b7b49f6da7 [fixes] fix message and type conversion; 2017-06-19 09:59:09 +05:30
Charles-Henri Decultot
2305eda82e Addition of new fields for POS Profile in Sales Invoice and POS Profile User link modification (#9339) 2017-06-19 09:25:54 +05:30
Umair Sayed
ac2e32a511 replaced some old images with new, #9262 (#9335) 2017-06-19 09:23:04 +05:30
Manas Solanki
9936100a6a send email on update and on update after submit fixes #8898 2017-06-16 22:18:20 +05:30
Makarand Bauskar
24173b9a12 Merge pull request #9337 from mbauskar/develop
[minor] use reload_doc instead of reload_doctype
2017-06-16 19:16:05 +05:30
mbauskar
3c1a53c325 [minor] use reload_doc instead of reload_doctype 2017-06-16 18:31:42 +05:30
Rushabh Mehta
73167eae60 [demo] make it faster, do not send user email 2017-06-16 16:55:32 +05:30