Nabin Hait
|
56f650f342
|
Merge branch 'master' into develop
|
2017-03-15 11:28:07 +05:30 |
|
Rushabh Mehta
|
82c258948d
|
[fixes] for recurring and tests
|
2017-03-14 19:13:39 +05:30 |
|
Rohit Waghchaure
|
11fa7a9311
|
[fix] Removed customer, supplier and added link_name from website_list_for_contact file
|
2017-03-14 13:26:10 +05:30 |
|
Saurabh
|
4f4d0a8369
|
[fix] validate negative quantity while creating purchase receipt
|
2017-03-13 15:37:47 +05:30 |
|
Rohit Waghchaure
|
0169341917
|
[Fix] Item variants broken when using naming series for items and vriants of numeric value
|
2017-03-10 19:40:08 +05:30 |
|
Nabin Hait
|
e68f32cf19
|
UOM Conversion in selling
|
2017-03-06 16:41:13 +05:30 |
|
Kanchan Chauhan
|
5a980ac87a
|
UOM Conversion in Selling
|
2017-03-06 16:41:12 +05:30 |
|
Nabin Hait
|
a07c3193cf
|
Merge pull request #7889 from rohitwaghchaure/sales_return_issue_for_pos
[Fix] Sales Return Invoice (Is POS) doesn't show correct payment data
|
2017-03-04 18:32:40 +05:30 |
|
Rohit Waghchaure
|
a31ffbc745
|
[Fix] Sales Return Invoice (Is POS) doesn't show correct payment data
|
2017-03-03 16:28:49 +05:30 |
|
Nabin Hait
|
2bcacec5c6
|
Merge pull request #7576 from RobertSchouten/compact_dev
[fix] compact print format not longer ignores format builder
|
2017-02-24 13:09:18 +05:30 |
|
Nabin Hait
|
cd837ecbac
|
Merge branch 'develop' into develop
|
2017-02-20 19:09:20 +05:30 |
|
Nabin Hait
|
9f4cb0c097
|
Fixed merge conflict
|
2017-02-20 15:00:04 +05:30 |
|
Rohit Waghchaure
|
4b9d2f2733
|
[Fix] Cleanup supplied items if supply raw material is set as No
|
2017-02-16 18:53:23 +05:30 |
|
suyashphadtare
|
34ab136b46
|
[fix] Remove un-necessary Whitespace
|
2017-02-10 19:14:43 +05:30 |
|
suyashphadtare
|
750a067688
|
[minor][fix] Show all warehouses with item actual qty in warehouse set query
|
2017-02-10 19:14:43 +05:30 |
|
suyashphadtare
|
049a88cc40
|
[minor] Show item quantity in warehouse set query
|
2017-02-10 19:14:43 +05:30 |
|
Nabin Hait
|
6ff0caa87a
|
Fixed merge conflict
|
2017-02-08 11:33:33 +05:30 |
|
Nabin Hait
|
0a6aaf4257
|
Get standard/historical valuation rate where missing: some minor fixes
|
2017-02-07 12:50:22 +05:30 |
|
Nabin Hait
|
ea8fab52c6
|
Get standard/historical valuation rate where missing, if item is not a sample item
|
2017-02-07 01:24:32 +05:30 |
|
Rushabh Mehta
|
a3d0bea375
|
Merge branch 'develop' into remove-party-status
|
2017-02-02 15:42:04 +05:30 |
|
Rushabh Mehta
|
87037bdd56
|
[minor] remove party status as it leads to duplicate notifications fixes #7346, also fix for #7568
|
2017-01-30 13:22:51 +05:30 |
|
Rohit Waghchaure
|
92c9ad8c72
|
Merge branch 'master' into develop
|
2017-01-28 14:14:33 +05:30 |
|
Kanchan Chauhan
|
b77eaf7053
|
[URGENT][FIX]Stock Controller fix
|
2017-01-28 13:26:46 +05:30 |
|
Rushabh Mehta
|
710dc5392f
|
[merge]
|
2017-01-27 15:48:31 +05:30 |
|
Nabin Hait
|
cb19f52985
|
Update stock_controller.py
|
2017-01-25 19:20:35 +05:30 |
|
Rohit Waghchaure
|
3899d74f15
|
[Fix] Get valuation rate from item master and update stock value difference
|
2017-01-25 18:47:53 +05:30 |
|
robert schouten
|
67eff49516
|
[fix] compact print format not longer ignores format builder
|
2017-01-25 08:20:43 +08:00 |
|
Nabin Hait
|
349d520ae2
|
Fixed merge conflict
|
2017-01-20 15:44:35 +05:30 |
|
Nabin Hait
|
4c952f48f8
|
Some minor fixes
|
2017-01-20 15:15:31 +05:30 |
|
Nabin Hait
|
a0b967f2cd
|
Get valuation rate from Item while not found based on SLE
|
2017-01-20 12:50:40 +05:30 |
|
Rohit Waghchaure
|
56cc542eb7
|
[Fix] sales return discount issue
|
2017-01-18 14:50:24 +05:30 |
|
Nabin Hait
|
dd839055e3
|
Fixed merge conflict
|
2017-01-17 15:52:56 +05:30 |
|
Rohit Waghchaure
|
f58cad6b13
|
[Fix] Calculate paid amount when is pos is enabled
|
2017-01-17 12:11:57 +05:30 |
|
Rushabh Mehta
|
ffd80a6061
|
[fix] warehouse test cases
|
2017-01-16 17:23:20 +05:30 |
|
Rushabh Mehta
|
6695830f3f
|
[fix] warehouse test cases
|
2017-01-16 16:57:53 +05:30 |
|
Rushabh Mehta
|
b92087cb2d
|
[cleanup] move contact, address to frappe 💥
|
2017-01-13 18:54:47 +05:30 |
|
Nabin Hait
|
b251cd4ccb
|
Fixed merge conflict
|
2017-01-13 14:34:54 +05:30 |
|
Rohit Waghchaure
|
29458836e4
|
[Fix] After amend the status become cancelled even if docstatus is zero
|
2017-01-13 12:51:19 +05:30 |
|
Nabin Hait
|
007c87ea63
|
Merge pull request #7440 from nabinhait/gle_repost_optimization
Optimization to reduce GLE reposting time for future stock transactions
|
2017-01-13 11:33:42 +05:30 |
|
Nabin Hait
|
9784d27317
|
Optimization to reduce GLE reposting time for future stock transactions
|
2016-12-30 16:21:35 +05:30 |
|
Nabin Hait
|
58291c77e9
|
Fixed version conflict
|
2016-12-23 17:43:42 +05:30 |
|
Rushabh Mehta
|
0632ee3da9
|
Merge branch 'v7.2.0-beta' into develop
|
2016-12-21 17:31:09 +05:30 |
|
Rushabh Mehta
|
c6bd7ade2f
|
[fix] inclusive tax + total bug and cleanup in stock entry get_uom, fixes #7253
|
2016-12-21 17:30:29 +05:30 |
|
Nabin Hait
|
f573d43b90
|
fixed version conflict
|
2016-12-20 11:40:15 +05:30 |
|
Nabin Hait
|
3fe99559ef
|
Fixed negative stock validation message for translation and fixed test cases
|
2016-12-16 15:30:43 +05:30 |
|
Rohit Waghchaure
|
6500ef404d
|
[Fix] Timeout error in item attribute validation
|
2016-12-16 13:35:50 +05:30 |
|
Nabin Hait
|
8c61f343b3
|
Validate negative stock on delivery while missing valuation rate for booking expenses
|
2016-12-15 13:46:03 +05:30 |
|
Nabin Hait
|
f49bbe1142
|
Cleanup of lead and opportunity status updating logic
|
2016-12-15 11:51:54 +05:30 |
|
Nabin Hait
|
ad4f1c7fd1
|
date is optional in get_exchange_rate
|
2016-12-09 12:14:47 +05:30 |
|
Nabin Hait
|
3113f00c46
|
Replaced spaces with tabs
|
2016-12-08 15:42:44 +05:30 |
|