ShashaQin
|
14baa70de3
|
Update project.py
|
2016-04-14 10:53:08 +08:00 |
|
Anand Doshi
|
65f2d92437
|
Merge branch 'vjFaLk-remove-celery' into develop
|
2016-04-13 19:28:56 +05:30 |
|
Valmik Jangla
|
4af736b989
|
Moved tasks content to newsletter.py
|
2016-04-13 19:11:55 +05:30 |
|
Rushabh Mehta
|
8c9c57c8f3
|
[minor] update party timestamp after transaction
|
2016-04-13 18:22:06 +05:30 |
|
Rushabh Mehta
|
0e2dd859b0
|
[cleanup] link dashboard for customer, supplier, item, employee and hide form by default
|
2016-04-13 17:22:09 +05:30 |
|
Nabin Hait
|
9f553e7206
|
Merge branch 'hotfix'
|
2016-04-13 16:04:37 +05:30 |
|
Nabin Hait
|
ba7d8b0cac
|
bumped to version 6.27.8
|
2016-04-13 16:34:37 +06:00 |
|
Nabin Hait
|
1ce6df8ff6
|
Merge pull request #5203 from nabinhait/credit_limit_fix
[fix] Ignore closed sales order in credit limit validation
|
2016-04-13 15:36:33 +05:30 |
|
Nabin Hait
|
7132bd3659
|
[fix] Ignore closed sales order in credit limit validation
|
2016-04-13 15:19:37 +05:30 |
|
Nabin Hait
|
13a2574bd6
|
Merge pull request #5159 from neilLasrado/setup-wizard-fix
Fixed setup wizard
|
2016-04-13 12:06:55 +05:30 |
|
Nabin Hait
|
09855fc3cc
|
Merge pull request #5158 from neilLasrado/hotfix
Removed education as a domain in ERPNext setup wizard
|
2016-04-13 12:05:11 +05:30 |
|
Nabin Hait
|
55f6308169
|
Merge branch 'anandpdoshi-fix/quotation-lead-tax-rule' into hotfix
|
2016-04-13 12:03:22 +05:30 |
|
Nabin Hait
|
c2ae1a7375
|
fixed merge conflict
|
2016-04-13 11:55:15 +05:30 |
|
Nabin Hait
|
4b09f48d94
|
Merge pull request #5195 from nabinhait/stock_non_stock_item_toggle
Dont allow to toggle stock and non-stock settings if any transaction exists against the item
|
2016-04-13 11:40:45 +05:30 |
|
Nabin Hait
|
c792e65d99
|
Merge pull request #5196 from nabinhait/report_fix34
[fix] Fixed pending so items for material request report
|
2016-04-13 11:40:34 +05:30 |
|
Rushabh Mehta
|
8bbca6fa2e
|
[enhancement] links menu in customer, supplier, item
|
2016-04-12 19:16:33 +05:30 |
|
Nabin Hait
|
dd94d4e43d
|
Dont allow to toggle stock and non-stock settings if any transaction exists against the item
|
2016-04-12 19:00:50 +05:30 |
|
Nabin Hait
|
471908ab9f
|
Merge pull request #5194 from nabinhait/gross_profit_fix
Gross profit fix
|
2016-04-12 18:57:45 +05:30 |
|
Nabin Hait
|
9fef3df6a0
|
[fix] Fixed pending so items for material request report
|
2016-04-12 18:46:47 +05:30 |
|
Nabin Hait
|
8a686ba982
|
[fix] Prevent from directly creating payment request
|
2016-04-12 17:02:15 +05:30 |
|
Nabin Hait
|
f509d13d28
|
[fix] Get average selling rate based on group by
|
2016-04-12 17:01:39 +05:30 |
|
Nabin Hait
|
96d7905383
|
Merge pull request #5177 from rohitwaghchaure/support_hot_fix
[Fix] Default letter head
|
2016-04-12 11:03:18 +05:30 |
|
Valmik Jangla
|
6842f2e75c
|
WIP code migration from Celery to RQ
|
2016-04-11 17:41:34 +05:30 |
|
Rushabh Mehta
|
5d0e8dee11
|
[fix] dashboard for customer, supplier
|
2016-04-11 17:34:49 +05:30 |
|
Rohit Waghchaure
|
b2e7a1f605
|
[Fix] Default letter head
|
2016-04-11 17:30:44 +05:30 |
|
Nabin Hait
|
3912a31a6f
|
Merge pull request #5176 from nabinhait/ar_ap_print_currency
Currency column in AR/AP and Sales/Purchase register report
|
2016-04-11 17:13:04 +05:30 |
|
Nabin Hait
|
b713406e22
|
Merge pull request #5180 from nabinhait/stock_entry_actual_qty
[fix] Set actual qty onload of the draft stock entry. Fixed #5172
|
2016-04-11 17:12:34 +05:30 |
|
Nabin Hait
|
126ef64203
|
Merge pull request #5133 from rohitwaghchaure/new_rfq
[Fixes]Portal, Supplier can view their addresses, default buying price list …
|
2016-04-11 15:17:15 +05:30 |
|
Nabin Hait
|
32b2a7795e
|
[fix] Set actual qty onload of the draft stock entry. Fixed #5172
|
2016-04-11 15:14:05 +05:30 |
|
Rohit Waghchaure
|
ae270d6648
|
[Fixes] Supplier can view their addresses, default buying price list issue
|
2016-04-11 13:58:33 +05:30 |
|
Nabin Hait
|
f945e10cce
|
Currency column in AR/AP and sales/purchase register report
|
2016-04-11 11:56:57 +05:30 |
|
Rushabh Mehta
|
f4d1b18895
|
[hooks] notify party on_change
|
2016-04-11 11:34:59 +05:30 |
|
Nabin Hait
|
4e10a61141
|
Merge pull request #5169 from nabinhait/patch_fix1
[fix] Fixed party update status patch
|
2016-04-09 16:13:40 +05:30 |
|
Nabin Hait
|
e1433aab30
|
[fix] Fixed party update status patch
|
2016-04-09 16:12:40 +05:30 |
|
Kanchan Chauhan
|
a4ff5d3195
|
Collaborate PM permission fixes and daily tme log fix
|
2016-04-08 23:22:04 +05:30 |
|
Rushabh Mehta
|
2dff9275f3
|
[test] fixed circular dependencies
|
2016-04-08 18:05:12 +05:30 |
|
Rushabh Mehta
|
6fe962e6ad
|
[test] fixed circular dependencies
|
2016-04-08 17:55:11 +05:30 |
|
Anand Doshi
|
2f957f27b0
|
[fix] apply Tax Rule for lead
|
2016-04-08 17:43:08 +05:30 |
|
Rushabh Mehta
|
bdefa2414f
|
[test] [fix] test-dependency
|
2016-04-08 17:40:06 +05:30 |
|
Neil Trini Lasrado
|
7b46e5148a
|
Fixed setup wizard
|
2016-04-08 17:28:44 +05:30 |
|
Rushabh Mehta
|
8cd1ab894c
|
[minor] [fix] notifications for customer, supplier
|
2016-04-08 17:26:53 +05:30 |
|
Rushabh Mehta
|
dda1349a2d
|
[minor] [fix] typo in customer_list.js
|
2016-04-08 17:22:52 +05:30 |
|
Rushabh Mehta
|
f16f9c569b
|
[enhancement] add status in customer, supplier
|
2016-04-08 17:21:00 +05:30 |
|
Rushabh Mehta
|
203cc962f5
|
[enhancement] Item Selector
|
2016-04-08 17:21:00 +05:30 |
|
Anand Doshi
|
79a415e3b8
|
[fix] Use for shopping cart validation in Tax Rule
|
2016-04-08 17:08:26 +05:30 |
|
Neil Trini Lasrado
|
ce893499d7
|
Removed education as a domain in ERPNext setup wizard
|
2016-04-08 16:52:53 +05:30 |
|
Anand Doshi
|
9b8937d257
|
Merge pull request #5157 from agusputra/patch-29
Update quotation.md
|
2016-04-08 16:37:13 +05:30 |
|
Anand Doshi
|
47d8c52281
|
Merge branch 'neilLasrado-develop' into develop
|
2016-04-08 16:36:35 +05:30 |
|
Neil Trini Lasrado
|
cb6430575b
|
Fixed validation message for disabled employee
|
2016-04-08 16:36:26 +05:30 |
|
Anand Doshi
|
1dd6329e5b
|
Merge branch 'shreyasp-matl-req-non-stock-item' into develop
|
2016-04-08 16:32:30 +05:30 |
|