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
Rushabh Mehta
c422874418
Update company.py
2017-06-20 12:19:36 +05:30
Rushabh Mehta
777526e3a8
Update __init__.py
2017-06-20 12:14: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
Rohit Waghchaure
e9ff1914fc
Added is_perpetual_inventory_enabled method
2017-06-20 11:26:37 +05:30
Rohit Waghchaure
65ccb42f95
fixed document
2017-06-20 10:21:34 +05:30
Rohit Waghchaure
6945d0dd8a
fixed test cases
2017-06-20 10:21:33 +05:30
Rohit Waghchaure
a5f40941ae
[Enhance] Companywise perpetual inventory setting
2017-06-20 10:21:33 +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
Ben Cornwell-Mott
2c77165fc6
Fixed small code issues (codecy)
2017-06-16 13:47:40 -07:00
Manas Solanki
9936100a6a
send email on update and on update after submit fixes #8898
2017-06-16 22:18:20 +05:30
bcornwellmott
6561b8ade9
Merge branch 'develop' into bom_convert_uom
2017-06-16 08:29:00 -07:00
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
tundebabzy
9a3462031d
[UX] Error in purchase transaction - Ignore instead of Prompt #7766 ( #9329 )
...
* sets tax category to "Total" if all items are non-stock items
* makes notification message translatable and removes multi-line string
* Update buying_controller.py
2017-06-16 15:30:14 +05:30
almeidapaulopt
31692a2595
Create a project from a Sales Order ( #9111 )
...
* init commit
* don't get tasks if project name is none
* cleanup
* Update sales_order.js
2017-06-16 15:29:41 +05:30
Makarand Bauskar
e159ce9a27
Merge pull request #9330 from mbauskar/develop
...
[minor] reload Domain doctype before executing patch
2017-06-16 14:36:22 +05:30
mbauskar
2ea55c7143
[minor] reload Domain doctype before executing patch
2017-06-16 14:33:59 +05:30
Makarand Bauskar
3d6697949c
[minor] fixed the child table field name ( #9328 )
...
* [minor] exclude Other domain from Domains
* [minor] fixed the child table field name
2017-06-16 14:12:28 +05:30
Sagar Vora
b1c794a4f9
[hot] fix global name args is not defined ( #9326 )
2017-06-16 13:50:35 +05:30
Faris Ansari
1ee615c9ad
Add .eslintrc for codacy ( #9321 )
2017-06-16 13:12:47 +05:30
rohitwaghchaure
fb45913b3b
[fix] Patch for move account head from account to warehouse ( #9325 )
2017-06-16 13:12:37 +05:30
Makarand Bauskar
dd986f659e
Merge branch 'pratu16x7-domainify' into domainify ( #9324 )
...
* bootstrap domains and set active_domain on setup
* [minor] Patch for domain docs
* [minor]
* Update create_domain_docs.py
2017-06-16 13:02:45 +05:30
Nabin Hait
84bc5601eb
Total sales cost in Project should be updated based on base_grand_total ( #9302 )
...
* Total sales cost in Project should be updated based on base_grand_total
* Patch to update sales cost in Project in base currency
2017-06-16 12:13:51 +05:30
Vishal Dhayagude
2510d1c86a
Training Events/Results link added to Employee ( #9313 )
2017-06-16 11:58:08 +05:30
Umair Sayed
5dadb0e19a
created help page for email inbox, fixes #9262 ( #9315 )
2017-06-16 11:57:44 +05:30
Britlog
224eb90199
Fix get_parents context ( #9296 )
2017-06-16 11:51:06 +05:30
Sagar Vora
5f407907a2
fix logic of quantity validation ( #9311 )
2017-06-16 11:43:36 +05:30
