Nabin Hait
|
c5064069c7
|
Merge branch 'staging-fixes' into manufacturing_settings_permissions_issue
|
2018-11-26 20:23:11 +05:30 |
|
Nabin Hait
|
218fa51dba
|
Merge branch 'staging-fixes' into validate_due_date_for_purchase_invoice
|
2018-11-26 20:23:00 +05:30 |
|
Nabin Hait
|
9fba32a917
|
Merge pull request #16098 from rohitwaghchaure/on_uncheck_is_return_clear_reference_number
On disabled is return field clear the reference field
|
2018-11-26 20:20:30 +05:30 |
|
Nabin Hait
|
73e3138a5b
|
Merge branch 'staging-fixes' into on_uncheck_is_return_clear_reference_number
|
2018-11-26 20:20:22 +05:30 |
|
deepeshgarg007
|
05c2989698
|
removed total from graph
|
2018-11-26 20:19:57 +05:30 |
|
Nabin Hait
|
0ccc05bdf7
|
Merge pull request #15997 from rohitwaghchaure/address_not_set_from_api
[Fix] Address not set from the API
|
2018-11-26 20:17:03 +05:30 |
|
Nabin Hait
|
7f02659425
|
Merge branch 'hotfix' into address_not_set_from_api
|
2018-11-26 20:16:54 +05:30 |
|
Nabin Hait
|
9170c2daab
|
Merge pull request #15989 from deepeshgarg007/bug-fixes
Minor issue fixes
|
2018-11-26 20:05:25 +05:30 |
|
Nabin Hait
|
b32abde2ac
|
Merge branch 'staging-fixes' into bug-fixes
|
2018-11-26 20:05:09 +05:30 |
|
Nabin Hait
|
2598c475ed
|
Merge pull request #15999 from codingCoffee/css
css: build files in v10
|
2018-11-26 20:02:18 +05:30 |
|
Saif Ur Rehman
|
5fdbc68ca3
|
Set Gross Profit on server-side validation of Sales Order
|
2018-11-26 19:32:16 +05:00 |
|
Rohit Waghchaure
|
b4a5993ece
|
On uncheck is return field clear the reference field
|
2018-11-26 20:02:01 +05:30 |
|
Nabin Hait
|
21983b8432
|
Merge pull request #16001 from jsukrut/staging-fixes
[FIX][#15018][PATIENT Relation should be unique]
|
2018-11-26 20:01:19 +05:30 |
|
Nabin Hait
|
bcd0ba0d69
|
Merge pull request #16041 from surajshetty3416/pos-profile-fix
fix: Add additional condition to get_pos_profile
|
2018-11-26 19:59:17 +05:30 |
|
Nabin Hait
|
56dc5c1be3
|
Merge branch 'staging-fixes' into pos-profile-fix
|
2018-11-26 19:59:07 +05:30 |
|
Nabin Hait
|
212a29ae2c
|
Merge pull request #16028 from rohitwaghchaure/not_able_to_view_general_ledger
[Fix] Not able to view general ledger for purchase invoice
|
2018-11-26 19:57:24 +05:30 |
|
Nabin Hait
|
25e60f3934
|
Merge pull request #16044 from ESS-LLP/fix-trial-balance
fix: Trial Balance print
|
2018-11-26 19:56:27 +05:30 |
|
Nabin Hait
|
4191d7eb52
|
Merge pull request #16045 from SaiFi0102/GrossProfit-Fix-Buying-Amount-Multiple-Invoice
Fixed get_buying_amount in Gross Profit report:
|
2018-11-26 19:55:06 +05:30 |
|
Nabin Hait
|
d0af0887be
|
Merge pull request #16051 from SaiFi0102/patch-1
Remove "Test" Letter Head
|
2018-11-26 19:47:07 +05:30 |
|
Nabin Hait
|
70642a0ae4
|
Merge pull request #16055 from rohitwaghchaure/fixed_holiday_list_not_working
[Fix] New holiday list form is not working
|
2018-11-26 19:44:19 +05:30 |
|
Nabin Hait
|
36f266355d
|
Merge branch 'staging-fixes' into fixed_holiday_list_not_working
|
2018-11-26 19:44:11 +05:30 |
|
Nabin Hait
|
ad1fba6a70
|
Merge branch 'develop' into reflinks-in-related-docs
|
2018-11-26 19:42:55 +05:30 |
|
Nabin Hait
|
736ce9a176
|
Merge pull request #16095 from SaiFi0102/BugFix-Rate-Calculation
Fixed error due to incorrect use of 'this' while calculating rate
|
2018-11-26 19:31:25 +05:30 |
|
Saif Ur Rehman
|
147fa73d3f
|
Fixed incorrect use of 'this' causing errors calculating rate
|
2018-11-26 18:14:06 +05:00 |
|
Rohit Waghchaure
|
d1a85a3637
|
[Fix] Due date can not be greter than posting date validation should consider supplier invoice date for purchase invoice
|
2018-11-26 18:42:29 +05:30 |
|
Rohit Waghchaure
|
15ed7a6351
|
[Fix] No permission for Manufacturing Settings
|
2018-11-26 17:31:18 +05:30 |
|
Anurag Mishra
|
e5248b6933
|
Merge branch 'new-fix-branch' of https://github.com/anurag810/erpnext into new-fix-branch
|
2018-11-26 17:25:28 +05:30 |
|
Anurag Mishra
|
5b6dd58b3e
|
fixed ZeroDivisionError in sales_order.py
|
2018-11-26 17:22:50 +05:30 |
|
Nabin Hait
|
fc6194e640
|
Merge branch 'staging-fixes' into new-fix-branch
|
2018-11-26 17:16:06 +05:30 |
|
Nabin Hait
|
b5fbfaf4cd
|
Merge pull request #16089 from frappe/update-stale-bot
[stale] Increase Number of days of inactivity
|
2018-11-26 17:15:46 +05:30 |
|
Nabin Hait
|
d5fc05c10b
|
Merge pull request #16090 from frappe/update-stale-bot-1-2
Update stale.yml
|
2018-11-26 17:15:19 +05:30 |
|
Nabin Hait
|
e8469daf0c
|
Merge branch 'staging-fixes' into update-stale-bot-1-2
|
2018-11-26 17:14:59 +05:30 |
|
Nabin Hait
|
f7b6c95326
|
Merge pull request #16087 from surajshetty3416/update-eslint-config
fix[eslintrc]: Add Vue to globals
|
2018-11-26 17:14:25 +05:30 |
|
deepeshgarg007
|
bd87903b56
|
Added condition for default amount
|
2018-11-26 17:13:59 +05:30 |
|
Anurag Mishra
|
e657fe84b8
|
making validation generic for sales order,sales invoice,purchase order etc.
|
2018-11-26 17:13:10 +05:30 |
|
Anurag mishra
|
6ddb15b3df
|
fix(validate): Qty is mandatory in delivery note
|
2018-11-26 17:13:10 +05:30 |
|
Anurag mishra
|
7b2c445707
|
Delivery Note fixes
|
2018-11-26 17:13:10 +05:30 |
|
Nabin Hait
|
059c6f8da5
|
Merge pull request #16070 from nabinhait/travis-fix-1
Travis fixes
|
2018-11-26 17:00:10 +05:30 |
|
Nabin Hait
|
73ca3cfca6
|
fix(test): removed test print
|
2018-11-26 16:16:42 +05:30 |
|
Anurag Mishra
|
42d3af3bbb
|
making validation generic for sales order,sales invoice,purchase order etc.
|
2018-11-26 15:19:17 +05:30 |
|
deepeshgarg007
|
533066eb87
|
Salary slip bug fix
|
2018-11-26 15:04:21 +05:30 |
|
Prateeksha Singh
|
758ca946fa
|
Update stale.yml
|
2018-11-26 14:45:54 +05:30 |
|
Prateeksha Singh
|
50b6a5ddc8
|
Update stale.yml
|
2018-11-26 14:44:26 +05:30 |
|
Rohit Waghchaure
|
3893ba302c
|
If is pos and no pos profile use the item's default warehouse for packing materials
|
2018-11-26 14:13:24 +05:30 |
|
Suraj Shetty
|
584430c49c
|
Add vue to globals
- Also set sourceType as module to avoid import lint error
|
2018-11-26 12:32:29 +05:30 |
|
Anurag mishra
|
66bd5810c5
|
fix(validate): Qty is mandatory in delivery note
|
2018-11-26 11:36:57 +05:30 |
|
Anurag mishra
|
bc4574b59d
|
Delivery Note fixes
|
2018-11-26 11:33:22 +05:30 |
|
Nabin Hait
|
2665c37f38
|
temp(travis): Print statement to fix travis
|
2018-11-26 11:05:28 +05:30 |
|
Nabin Hait
|
48e0e19b03
|
fix(test): Fixed salary slip and sales analytics test cases
|
2018-11-26 11:05:28 +05:30 |
|
Nabin Hait
|
2508d11097
|
fix(test): Test cases fixed
|
2018-11-26 11:05:28 +05:30 |
|