Anand Doshi
|
700ff7a127
|
Merge branch 'KanchanChauhan-WebsiteChanges' into develop
|
2016-04-22 18:53:39 +05:30 |
|
Anand Doshi
|
e3bd78e912
|
[css] portal
|
2016-04-22 18:53:21 +05:30 |
|
Kanchan Chauhan
|
e0818f8f46
|
Website Changes
|
2016-04-22 17:47:16 +05:30 |
|
Rushabh Mehta
|
0394aec6a4
|
[wip] inventory tool
|
2016-04-22 17:22:22 +05:30 |
|
Rushabh Mehta
|
68d428bfd4
|
[fix] for sort selector
|
2016-04-22 13:23:34 +05:30 |
|
Nabin Hait
|
d6bc490274
|
Merge branch 'master' into develop
|
2016-04-22 12:24:26 +05:30 |
|
Nabin Hait
|
2cda7fd834
|
Merge branch 'hotfix'
|
2016-04-22 12:15:35 +05:30 |
|
Nabin Hait
|
054e2952c8
|
bumped to version 6.27.11
|
2016-04-22 12:45:35 +06:00 |
|
Nabin Hait
|
b4f1f1e8b8
|
Merge pull request #5255 from nabinhait/hotfix1
[fix] Fixed ambiguous column name in query
|
2016-04-22 12:12:47 +05:30 |
|
Nabin Hait
|
3ab6181a4f
|
[fix] Fixed ambiguous column name in query
|
2016-04-22 11:26:44 +05:30 |
|
Rushabh Mehta
|
621283c5c5
|
[enhancement] stock balance page
|
2016-04-21 19:00:34 +05:30 |
|
Rushabh Mehta
|
cd3c979207
|
[cleanup] website.less
|
2016-04-21 13:09:41 +05:30 |
|
Rushabh Mehta
|
202cb7cdf1
|
Merge pull request #5249 from nabinhait/fixed_asset
Fixed asset
|
2016-04-21 11:41:11 +05:30 |
|
Rushabh Mehta
|
6c99c65a97
|
Merge pull request #5244 from vjFaLk/patch-2
Fixed spelling
|
2016-04-21 11:39:59 +05:30 |
|
Rushabh Mehta
|
c291ab64a6
|
Merge pull request #5197 from KanchanChauhan/UXChanges_ERPNext
[WIP] No not merge
|
2016-04-21 11:39:45 +05:30 |
|
Rushabh Mehta
|
f2c3cb85a9
|
Merge pull request #5164 from KanchanChauhan/project-permissions
Collaborate PM permission fixes and daily tme log fix
|
2016-04-21 11:37:31 +05:30 |
|
Rushabh Mehta
|
02772442b6
|
[cleanup] added dashboard in project
|
2016-04-20 18:45:56 +05:30 |
|
Nabin Hait
|
595d3c03ef
|
updated docs for fixed asset
|
2016-04-20 18:17:05 +05:30 |
|
Nabin Hait
|
85a2776e91
|
Depreciation Schedule considering already booked depreciations for existing asset and testcases
|
2016-04-20 17:57:12 +05:30 |
|
Nabin Hait
|
318fa287df
|
[report] Asset Depreciations and Balances
|
2016-04-20 17:57:12 +05:30 |
|
Nabin Hait
|
e58c26edca
|
[report] Added asset depreciation ledger report
|
2016-04-20 17:57:12 +05:30 |
|
Nabin Hait
|
cd0e8ce8ad
|
Fixes and modification in fixed asset
|
2016-04-20 17:57:12 +05:30 |
|
Nabin Hait
|
3d9c5c0c20
|
Fixed Asset module cleanup and fixes
|
2016-04-20 17:57:11 +05:30 |
|
Anand Doshi
|
b2b02a574a
|
Merge branch 'master' into develop
|
2016-04-20 16:45:20 +05:30 |
|
Anand Doshi
|
18433591c3
|
Merge branch 'hotfix'
|
2016-04-20 16:43:00 +05:30 |
|
Anand Doshi
|
25dd38c8f2
|
bumped to version 6.27.10
|
2016-04-20 17:13:00 +06:00 |
|
Kanchan Chauhan
|
11638ba358
|
Changes 3
|
2016-04-20 16:24:25 +05:30 |
|
Kanchan Chauhan
|
704f248952
|
Changes 2
|
2016-04-20 16:24:24 +05:30 |
|
Kanchan Chauhan
|
2dbf5294a9
|
[WIP] No not merge
|
2016-04-20 16:24:24 +05:30 |
|
Valmik
|
12bff6ed7c
|
Fixed spelling
|
2016-04-20 13:55:48 +05:30 |
|
Nabin Hait
|
88742e0912
|
Merge pull request #5241 from neilLasrado/lead
Removed no-copy from source in lead
|
2016-04-20 13:02:12 +05:30 |
|
Nabin Hait
|
867dfec64b
|
Reload bin in reserved qty reposting patch
|
2016-04-20 11:53:34 +05:30 |
|
Neil Trini Lasrado
|
ab822c5d16
|
Removed no-copy from source in lead
|
2016-04-20 11:03:15 +05:30 |
|
Anand Doshi
|
4e30b84d88
|
[fix] templates for pull request and issues
|
2016-04-19 13:13:08 +05:30 |
|
Rushabh Mehta
|
2c49473df8
|
Merge pull request #5234 from MaxMorais/patch-3
get_address_display calling method error
|
2016-04-18 23:07:57 +05:30 |
|
Rushabh Mehta
|
4e6402e418
|
Merge pull request #5230 from vjFaLk/gh-templates
[Fix] Added Discuss link in Issue Template
|
2016-04-18 23:04:09 +05:30 |
|
Maxwell Morais
|
52ec0fa7e9
|
get_address_display calling method error
get_address_display, dont can be use in replacement as a function in the doctype controler, since it dont expect `cdt` and `cdn` as arguments.
972c25f78d/erpnext/public/js/utils/party.js (L53)
|
2016-04-18 13:24:25 -03:00 |
|
Rushabh Mehta
|
0525387328
|
[enhancement] added reserved_qty_for_production in bin and updated item dashboard
|
2016-04-18 19:27:46 +05:30 |
|
Nabin Hait
|
c46c1f0288
|
[fix] Rejected serial nos in purchase invoice
|
2016-04-18 17:46:36 +05:30 |
|
Nabin Hait
|
972224e71a
|
Merge branch 'saurabh6790-pi_update_stock' into develop
|
2016-04-18 17:01:57 +05:30 |
|
Nabin Hait
|
14aa9c5320
|
[fix] Cleanup and fixes in update stock feature in Purchase Invoice
|
2016-04-18 16:59:47 +05:30 |
|
Nabin Hait
|
ffd1e4efe6
|
Removed db_set from inside validate
|
2016-04-18 15:58:44 +05:30 |
|
Saurabh
|
7fee1b8343
|
[fixes] set expence account to item on sales invoice
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
224737b9ed
|
[fixes] split make gl entry function into chuncks as per SI
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
fbb342c1ac
|
[enhancement] update landed cost on PI via landed cost voucher when update stock is set on PI
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
130c57b201
|
[fixes] code clean-up
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
e29248bcb3
|
[fixes] test-case to validate quantity after update stock and purchase return and code-cleaning
|
2016-04-18 15:58:43 +05:30 |
|
Saurabh
|
d697f3d6a3
|
[minor][fix] reset is_paid if company not selected
|
2016-04-18 15:58:42 +05:30 |
|
Saurabh
|
43520f93a1
|
[fixes] test cases, code cleanup.
|
2016-04-18 15:58:42 +05:30 |
|
Saurabh
|
2a0e2fe95c
|
[test-case] test update stock and payment
|
2016-04-18 15:57:56 +05:30 |
|