Nabin Hait
|
3858d12f1d
|
Merge pull request #4317 from nabinhait/close_feature
Show Close button in Delivery Note and Purchase Receipt, only if it is returned and user has submit permission
|
2015-11-16 15:52:41 +05:30 |
|
Nabin Hait
|
adc93b797a
|
Merge pull request #4316 from nabinhait/advance_fix
[fix] Invoice Outstanding calculation related to advance
|
2015-11-16 15:50:32 +05:30 |
|
Nabin Hait
|
b6de519571
|
[fix] Test case fixed
|
2015-11-16 15:50:10 +05:30 |
|
Nabin Hait
|
58c4646199
|
[fix][cleanup] Leave allocation, application and balance report cleanup and fixes
|
2015-11-16 15:35:14 +05:30 |
|
Anand Doshi
|
4fbf01fd9d
|
[fix] urlencode address list's link
|
2015-11-16 15:05:49 +05:30 |
|
Anand Doshi
|
1ed82834ce
|
[fix] re-make setup wizard slides on change of language
|
2015-11-16 12:58:14 +05:30 |
|
Nabin Hait
|
cd87e76d88
|
[fix] Check Salary Structure validity
|
2015-11-15 11:06:55 +05:30 |
|
Rushabh Mehta
|
834b3e6f83
|
[fix] added missing address hook for website permissions
|
2015-11-13 14:38:12 +05:30 |
|
Nabin Hait
|
95d025f9aa
|
Show Close button in Delivery Note and Purchase Receipt, only if it is returned and user has submit permission
|
2015-11-13 14:22:32 +05:30 |
|
Nabin Hait
|
90c6d7bb47
|
[fix] Invoice Outstanding calculation related to advance
|
2015-11-13 14:04:03 +05:30 |
|
Nabin Hait
|
59ba9e3d56
|
Merge pull request #4314 from anandpdoshi/fix/po-non-stock-receive
[fix] Don't show Receive for a Purchase Order having non-stock items, show Close button only for users with Submit rights
|
2015-11-13 13:59:04 +05:30 |
|
Rushabh Mehta
|
c1531e7008
|
[minor] catch SSL error on make_thumbnail, via support
|
2015-11-13 11:39:38 +05:30 |
|
Rushabh Mehta
|
511421b6a3
|
[minor] [enhancement] ability to make web-form standard, reload web-forms, merge after https://github.com/frappe/frappe/pull/1405
|
2015-11-13 11:04:50 +05:30 |
|
Rushabh Mehta
|
26c54bb4fb
|
[minor] new quote
|
2015-11-13 10:42:20 +05:30 |
|
Anand Doshi
|
d4b05fbd51
|
bumped to version 6.8.4
|
2015-11-12 21:07:12 +06:00 |
|
Anand Doshi
|
d65a03d437
|
[fix] material request type in reorder
|
2015-11-12 20:36:44 +05:30 |
|
Anand Doshi
|
f774f75c63
|
bumped to version 6.8.3
|
2015-11-12 21:05:48 +06:00 |
|
Anand Doshi
|
5f6546c8a5
|
bumped to version 6.8.2
|
2015-11-12 20:31:53 +06:00 |
|
Anand Doshi
|
ca5b593e38
|
[hotfix] setup wizard tax rate
|
2015-11-12 20:00:50 +05:30 |
|
Anand Doshi
|
cea5479f4d
|
[fix] Don't show Receive for a Purchase Order having non-stock items, show Close button only for users with Submit rights
|
2015-11-12 18:39:57 +05:30 |
|
Anand Doshi
|
6303f84d45
|
[minor] fix test case
|
2015-11-12 18:11:58 +05:30 |
|
Anand Doshi
|
87c0e9f03a
|
bumped to version 6.8.1
|
2015-11-12 18:12:41 +06:00 |
|
Anand Doshi
|
d40d1e9a59
|
[optimize] Payment Reconciliation and Payment Tool
|
2015-11-12 17:42:05 +05:30 |
|
Anand Doshi
|
3fc1c44334
|
bumped to version 6.8.0
|
2015-11-12 17:40:48 +06:00 |
|
Anand Doshi
|
bb347f5afa
|
[translations]
|
2015-11-12 16:39:58 +05:30 |
|
Anand Doshi
|
938b530ebf
|
[change-log]
|
2015-11-12 15:44:09 +05:30 |
|
Anand Doshi
|
0b5489ca88
|
Merge pull request #4312 from nabinhait/delete_uom_replace_utility
Deleted Stock UOM Replace Utility
|
2015-11-12 15:26:41 +05:30 |
|
Anand Doshi
|
adebf31041
|
Merge pull request #4313 from saurabh6790/doc
[help-page] drop-shipping documentation
|
2015-11-12 15:25:50 +05:30 |
|
Saurabh
|
11cc43a5a6
|
[help-page] drop-shipping documentation
|
2015-11-12 12:39:21 +05:30 |
|
Nabin Hait
|
61fb7ee5b8
|
Deleted Stock UOM Replace Utility
|
2015-11-12 12:06:47 +05:30 |
|
Rushabh Mehta
|
37b4d75e4a
|
[re-org] setup wizard in frappe
|
2015-11-12 11:45:47 +05:30 |
|
Anand Doshi
|
f71ecbba2c
|
Merge pull request #4311 from rmehta/auth-rule-cleanup
Auth rule cleanup
|
2015-11-12 11:40:55 +05:30 |
|
Anand Doshi
|
c5c6c0669f
|
[fix] gross profit
|
2015-11-12 11:07:32 +05:30 |
|
Anand Doshi
|
fe85b2ea17
|
Merge branch 'nabinhait-erpnext_docs' into develop
|
2015-11-10 18:59:55 +05:30 |
|
Anand Doshi
|
1c1eb7018c
|
[docs] fixed Linked With and title
|
2015-11-10 18:58:56 +05:30 |
|
Anand Doshi
|
39982a5f02
|
bumped to version 6.7.8
|
2015-11-10 12:01:29 +06:00 |
|
Rushabh Mehta
|
8f228dd7f9
|
[fix] [minor] closed not in notifications
|
2015-11-10 11:28:35 +05:30 |
|
Rushabh Mehta
|
739aa4d51a
|
[minor] allow pricing rule to have negative discount
|
2015-11-09 17:05:12 +05:30 |
|
Nabin Hait
|
f9ef0e4e15
|
[docs] Fixed ref docs, image and video links
|
2015-11-09 15:41:45 +05:30 |
|
Nabin Hait
|
fc51ec7f58
|
[docs] Added existing erpnext manual
|
2015-11-09 14:40:34 +05:30 |
|
Nabin Hait
|
7ba4d02444
|
[docs] First commit for docs
|
2015-11-09 14:40:29 +05:30 |
|
Anand Doshi
|
7489d29813
|
bumped to version 6.7.7
|
2015-11-09 13:47:49 +06:00 |
|
Anand Doshi
|
7f77002015
|
Revert b28573ab03
|
2015-11-09 13:16:24 +05:30 |
|
Anand Doshi
|
b28573ab03
|
Merge pull request #4294 from neilLasrado/develop
[Minor fix] Allowed maintenance schedule to be imported via data import tool
|
2015-11-09 13:13:41 +05:30 |
|
Anand Doshi
|
c756ff67b0
|
Merge pull request #4296 from anandpdoshi/sales-order-allow-delivery
[fix] Allow both Purchase Order and Delivery from Sales Order, based on drop shipping checkbox
|
2015-11-09 13:13:14 +05:30 |
|
Anand Doshi
|
4e72ef1421
|
[fix] Allow both Purchase Order and Delivery from Sales Order, based on drop shipping checkbox
|
2015-11-09 13:01:49 +05:30 |
|
Neil Trini Lasrado
|
6b173f3a67
|
Allowed maintenance schedule to be imported via data import tool
|
2015-11-09 11:38:06 +05:30 |
|
Rushabh Mehta
|
bbcce8cca0
|
[minor] [cleanup] cosmetic cleanup and fix to start auth rule, did not do big cleanup
|
2015-11-09 11:28:51 +05:30 |
|
Rushabh Mehta
|
c438c1dec7
|
[minor] allow pricing rule to have negative discount
|
2015-11-07 20:28:43 +05:30 |
|
Anand Doshi
|
64949bfc4b
|
bumped to version 6.7.6
|
2015-11-07 16:10:22 +06:00 |
|
Anand Doshi
|
438c4fb279
|
[patch] reload doctype Leave Allocation
|
2015-11-07 15:38:29 +05:30 |
|
Rushabh Mehta
|
0d7213122a
|
bumped to version 6.7.5
|
2015-11-06 17:24:17 +06:00 |
|
Rushabh Mehta
|
4268b0092a
|
[minor] don't show po / mr buttons if delivered
|
2015-11-06 16:52:18 +05:30 |
|
Rushabh Mehta
|
64e31e9a4e
|
[fix] process payroll
|
2015-11-06 14:47:12 +05:30 |
|
Rushabh Mehta
|
1a8d4b6ea7
|
bumped to version 6.7.4
|
2015-11-06 12:15:09 +06:00 |
|
Rushabh Mehta
|
97426776bd
|
Merge pull request #4281 from nabinhait/address_fix
[fix] Clear addressed and contacts on a new form
|
2015-11-06 11:02:31 +05:30 |
|
Rushabh Mehta
|
169089bdde
|
bumped to version 6.7.3
|
2015-11-06 11:19:53 +06:00 |
|
Rushabh Mehta
|
c14f80838b
|
[fix] [hot] leave allocation patch
|
2015-11-06 10:49:16 +05:30 |
|
Rushabh Mehta
|
0d58501229
|
bumped to version 6.7.2
|
2015-11-06 11:11:06 +06:00 |
|
Nabin Hait
|
7c654cd1bb
|
Leave allocation patch included
|
2015-11-06 10:37:26 +05:30 |
|
Rushabh Mehta
|
54fc260a42
|
[minor] trigger link triggers while mapping material request to po to set supplier default currency
|
2015-11-05 15:26:02 +05:30 |
|
Rushabh Mehta
|
7a39d51366
|
[fix] pull tax rate in item tax
|
2015-11-05 15:19:11 +05:30 |
|
Nabin Hait
|
c3ced9a0b5
|
[fix][report] Buying amount for product bundle in Gross Profit report
|
2015-11-05 13:13:31 +05:30 |
|
Rushabh Mehta
|
afd3209017
|
bumped to version 6.7.1
|
2015-11-05 11:21:31 +06:00 |
|
Rushabh Mehta
|
c541b87bb9
|
[thumbnail] remove attachment if fails
|
2015-11-05 10:49:42 +05:30 |
|
Rushabh Mehta
|
6a7edd32aa
|
bumped to version 6.7.0
|
2015-11-04 18:48:07 +06:00 |
|
Rushabh Mehta
|
fc307970aa
|
[translations]
|
2015-11-04 18:02:45 +05:30 |
|
Rushabh Mehta
|
b9e7cb02f4
|
[change-log]
|
2015-11-04 17:02:13 +05:30 |
|
Saurabh
|
d805bd7daf
|
[fixes] update delivery status
|
2015-11-04 16:40:09 +05:30 |
|
Rushabh Mehta
|
ac53f2dbb1
|
[test] [fix]
|
2015-11-04 15:47:08 +05:30 |
|
Rushabh Mehta
|
20a7d820ab
|
[fix] shot ledger buttons for closed DN / PR
|
2015-11-04 15:31:41 +05:30 |
|
Rushabh Mehta
|
d48c2394e8
|
[cleanup] drop ship testing & cleanup
|
2015-11-04 15:24:04 +05:30 |
|
Rushabh Mehta
|
58101e9e6c
|
Merge pull request #4272 from nabinhait/report-fix1
[report] Added delay in payment column
|
2015-11-04 13:18:42 +05:30 |
|
Rushabh Mehta
|
666131d2fe
|
Merge pull request #4271 from saurabh6790/drop-shipping
Exclude warehouse from drop ship and re-open status for DN / PR
|
2015-11-04 13:18:20 +05:30 |
|
Rushabh Mehta
|
118f043335
|
Merge pull request #4270 from rmehta/email-digest-fix
Email digest fixes
|
2015-11-04 13:18:08 +05:30 |
|
Nabin Hait
|
b4a51ec80b
|
[report] Added delay in payment column
|
2015-11-04 13:09:48 +05:30 |
|
Saurabh
|
6197860643
|
[fixes] test case update
|
2015-11-04 12:43:40 +05:30 |
|
Saurabh
|
95fbfa4928
|
[fixes] typo fixes
|
2015-11-04 12:10:01 +05:30 |
|
Saurabh
|
b7f0a4961e
|
- no delivery / reserve warehouse in drop ship
- “Re-open” in DN / PR after “Stop” / “Close"
- check for closed status in reports
|
2015-11-04 12:03:54 +05:30 |
|
Rushabh Mehta
|
9c044eefff
|
[cleanup] re-arrange drop ship field
|
2015-11-03 18:28:37 +05:30 |
|
Rushabh Mehta
|
5951692db0
|
[fix] cleanup stop-resume code
|
2015-11-03 18:20:39 +05:30 |
|
Rushabh Mehta
|
bd4814fbb7
|
[fix] email digest periods for weekly and monthly
|
2015-11-03 16:55:33 +05:30 |
|
Rushabh Mehta
|
7d23e4286e
|
[minor] move item to top in stock module page
|
2015-11-03 16:25:09 +05:30 |
|
Saurabh
|
c40148e0da
|
[fixes] missing delivered by supplier field
|
2015-11-03 10:32:46 +05:30 |
|
Rushabh Mehta
|
a9dda232b2
|
[minor] move item to top in stock module page
|
2015-11-02 17:47:50 +05:30 |
|
Saurabh
|
12ffd914ee
|
[fixes] args fixes
|
2015-11-02 16:10:09 +05:30 |
|
Rushabh Mehta
|
b1d8979a59
|
Merge pull request #4179 from saurabh6790/drop-shipping
Drop shipping
|
2015-11-02 15:43:48 +05:30 |
|
Rushabh Mehta
|
ec2d0030b7
|
Merge pull request #4265 from nabinhait/jv_fix
[cleanup] Make Payment Entry from Order/Invoice
|
2015-11-02 15:23:01 +05:30 |
|
Rushabh Mehta
|
55d0506155
|
Merge pull request #4264 from superlack/patch-3
Update time_log_batch.py
|
2015-11-02 15:21:59 +05:30 |
|
Rushabh Mehta
|
5e9b52c273
|
Merge pull request #4263 from superlack/patch-2
Update time_log_batch_detail.json
|
2015-11-02 15:21:54 +05:30 |
|
Rushabh Mehta
|
00b4663e12
|
Merge pull request #4262 from saurabh6790/close_pr_dn
[feature] Close feature for Purchase Receipt and Delivery Note
|
2015-11-02 15:21:19 +05:30 |
|
Rushabh Mehta
|
e54a4004ec
|
Merge pull request #4258 from anandpdoshi/fixes-3to6
[fix] issues encountered migrating from v3/4 to 6
|
2015-11-02 15:20:25 +05:30 |
|
Rushabh Mehta
|
d0b086ca54
|
Merge pull request #4255 from anandpdoshi/slovene-language
added Slovene and updated translations
|
2015-11-02 15:20:17 +05:30 |
|
Rushabh Mehta
|
8d1191ac8f
|
Merge pull request #4252 from anandpdoshi/edge-case-website-variant-selection
[fix] Edge case in variant selection in website - when variant has less number of attributes than template
|
2015-11-02 15:20:10 +05:30 |
|
Rushabh Mehta
|
a938b81e1c
|
Merge pull request #4251 from saurabh6790/hr
Leave allocation based on Date range
|
2015-11-02 15:19:55 +05:30 |
|
Saurabh
|
7cd0ba70d9
|
[fixes] typo error
|
2015-11-02 15:18:23 +05:30 |
|
Nabin Hait
|
66340f9894
|
[cleanup] Make Payment Entry from Order/Invoice
|
2015-11-02 14:40:47 +05:30 |
|
superlack
|
41f7f7442b
|
Update time_log_batch.py
|
2015-11-02 00:39:36 -08:00 |
|
superlack
|
126fb31f9a
|
Update time_log_batch_detail.json
|
2015-11-02 00:38:17 -08:00 |
|
Saurabh
|
a8a91cca16
|
[feature] Close feature for Purchase Receipt and Delivery Note
|
2015-11-02 12:57:08 +05:30 |
|