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 |
|
Saurabh
|
381385d19a
|
[fixes] add status 'Closed' in filter creating PR, PI from PO and SI, DN from SO
|
2015-11-02 11:30:51 +05:30 |
|
Anand Doshi
|
aba8fdd18d
|
[fix] issues encountered migrating from v3/4 to 6
|
2015-10-31 22:49:42 +05:30 |
|
Nabin Hait
|
915778fb69
|
[fix] Clear addressed and contacts on a new form
|
2015-10-30 14:43:13 +05:30 |
|
Anand Doshi
|
bacc679df5
|
[language] added Slovene and updated translations
|
2015-10-30 12:54:27 +05:30 |
|
Anand Doshi
|
b0388d971a
|
[minor] reduced size of video placeholder
|
2015-10-30 12:54:10 +05:30 |
|
Saurabh
|
61c9ea938d
|
[Change Log] change log entry for drop shipment
|
2015-10-30 12:02:24 +05:30 |
|
Saurabh
|
6956eee790
|
[fixes] test case and code rewrite
|
2015-10-29 19:43:35 +05:30 |
|
Saurabh
|
2e65aadb1e
|
[fixes] reload doc after status update and supplier address fetching
|
2015-10-29 19:43:35 +05:30 |
|
Saurabh
|
653cffec1e
|
[change_log and fixes] set print hide, add change_log
|
2015-10-29 19:43:35 +05:30 |
|
Saurabh
|
cc8f1afa56
|
[fixes] test case fixes for drop shipping
|
2015-10-29 19:43:35 +05:30 |
|
Saurabh
|
2f702dcb32
|
[fixes] bulk close facility, rename Drop Ship to Delivered By Supplier
|
2015-10-29 19:43:35 +05:30 |
|
Saurabh
|
f857d81f35
|
[fixes]test case to check updated delivered qty
|
2015-10-29 19:43:34 +05:30 |
|
Saurabh
|
6d64fe378d
|
[fixes] remover per_ordered field and update delivered qty from perchase order via delivered by supplier -1
|
2015-10-29 19:43:34 +05:30 |
|
Saurabh
|
b0ab93f779
|
[fixes] typo error
|
2015-10-29 19:43:34 +05:30 |
|
Saurabh
|
df1c1a573f
|
[fixes] test case for per_ordered
|
2015-10-29 19:43:34 +05:30 |
|
Saurabh
|
a1f2aec918
|
[fixes] check ordered and reserved qrt, check closed status for so and po
|
2015-10-29 19:43:34 +05:30 |
|
Saurabh
|
d8930a776d
|
[fixes] test case import fix
|
2015-10-29 19:43:34 +05:30 |
|
Saurabh
|
8a8ef85174
|
[fixes] reviwe fixes
|
2015-10-29 19:43:33 +05:30 |
|
Saurabh
|
edba048c14
|
[fixes] set is_stock_item for test items
|
2015-10-29 19:43:33 +05:30 |
|
Saurabh
|
b705798ccb
|
[enhance & fixes] Print Format on PO for Drop Shipping
|
2015-10-29 19:43:33 +05:30 |
|
Saurabh
|
5e0b0b4b97
|
[enhance] make PO from SO if supplier is specified
|
2015-10-29 19:43:33 +05:30 |
|
Saurabh
|
a4efbf0db7
|
[fixes] check for close status
|
2015-10-29 19:43:33 +05:30 |
|
Saurabh
|
e930f0f74e
|
[fixes] filter on supplier list for DropShip, checking closed status
|
2015-10-29 19:43:33 +05:30 |
|
Saurabh
|
99543f72d8
|
[fixes] test case for drop shipping and minor fixes for test_reserved_qty_for_partial_delivery & test_reserved_qty_for_partial_delivery_with_packing_list
|
2015-10-29 19:43:32 +05:30 |
|
Saurabh
|
1a9646739a
|
[fixes][rename-field-name] drop_ship to is_drop_ship
|
2015-10-29 19:43:32 +05:30 |
|
Saurabh
|
bd65cb8817
|
[fixes] field rename and test case for drop ship
|
2015-10-29 19:43:32 +05:30 |
|
Saurabh
|
98b287565a
|
[enhance] close purchase order
|
2015-10-29 19:43:32 +05:30 |
|
Saurabh
|
c6dbe70256
|
[Fixes] Drop Shipping
|
2015-10-29 19:43:32 +05:30 |
|
Saurabh
|
556536615e
|
[minor fix] Status fix in listview
|
2015-10-29 19:43:31 +05:30 |
|
Saurabh
|
8bd96f1c08
|
[Test Case] Test case to check drop shipping
|
2015-10-29 19:43:31 +05:30 |
|
Saurabh
|
5b7e9a1c94
|
[minor fixes]
|
2015-10-29 19:43:31 +05:30 |
|
Saurabh
|
c306b21415
|
[merge fixes]
|
2015-10-29 19:43:31 +05:30 |
|
Anand Doshi
|
c39cef363c
|
[fix] stop welcome video if user moves to another page
|
2015-10-29 18:37:17 +05:30 |
|
Nabin Hait
|
02a56b4e1a
|
bumped to version 6.6.7
|
2015-10-29 17:05:06 +06:00 |
|
Nabin Hait
|
9a6df0341f
|
Merge pull request #4246 from anandpdoshi/welcome-to-erpnext
Show Welcome to ERPNext after completing Setup Wizard
|
2015-10-29 16:29:10 +05:30 |
|
Anand Doshi
|
7dab3c1f85
|
Show Welcome to ERPNext after completing Setup Wizard
|
2015-10-29 15:32:00 +05:30 |
|
Nabin Hait
|
f9a974385a
|
[fix] Consider Rejected Qty for Qty validation in Purchase Receipt
|
2015-10-29 14:54:29 +05:30 |
|
Saurabh
|
20a653e829
|
[fixes] Test case fixes for leave application
|
2015-10-29 14:27:57 +05:30 |
|
Saurabh
|
a2c668cb77
|
[fixes] patch, test cases and validations
|
2015-10-29 14:27:57 +05:30 |
|
Saurabh
|
d0b0a80be3
|
[enhacement] remove fiscal year from leave allocation
|
2015-10-29 14:27:57 +05:30 |
|
Anand Doshi
|
532b9e8bfb
|
[fix] Edge case in variant selection in website - when variant has less number of attributes than template
|
2015-10-29 13:20:07 +05:30 |
|
Anand Doshi
|
21e09a2bd8
|
[enhancement] Ability to disable an Item
|
2015-10-29 12:39:47 +05:30 |
|
Nabin Hait
|
1aa6e98136
|
Merge pull request #4249 from nabinhait/cc_fix
[fix] Default cost center as per company
|
2015-10-29 12:28:20 +05:30 |
|
Nabin Hait
|
8372c44262
|
[fix] Default cost center as per company
|
2015-10-29 11:50:36 +05:30 |
|
Anand Doshi
|
6d69ca6bac
|
[fix] don't show expired items in website item list. Fixes #4210.
|
2015-10-29 11:35:16 +05:30 |
|
Nabin Hait
|
4757d0634a
|
bumped to version 6.6.6
|
2015-10-28 16:37:13 +06:00 |
|
Nabin Hait
|
dc8ce7f7e9
|
Merge pull request #4245 from nabinhait/sr_no
[fix] Serial No query in Warranty Claim
|
2015-10-28 15:51:32 +05:30 |
|
Nabin Hait
|
a90a0528aa
|
Fixed conflict
|
2015-10-28 15:50:26 +05:30 |
|
Nabin Hait
|
350f9592d3
|
Merge pull request #4237 from sbkolate/develop
[minor] Update Help Video Links in Buying, CRM, Selling #4233
|
2015-10-28 15:44:39 +05:30 |
|
Nabin Hait
|
43e50de6ef
|
Merge pull request #4243 from nabinhait/last_pur_rate
[patch] Deleted Item-wise Last Purchase Rate report
|
2015-10-28 15:42:35 +05:30 |
|
Nabin Hait
|
a530f410e3
|
Merge pull request #4242 from nabinhait/to_warehouse_dn
[fix] Ignore users permission for To Warehouse field in Delivery Note
|
2015-10-28 15:42:16 +05:30 |
|
Nabin Hait
|
bdfb070ed6
|
[fix] Serial No query in Warranty Claim
|
2015-10-28 15:38:22 +05:30 |
|
Anand Doshi
|
caa9fc033f
|
[hotfix] vietnamese translation for Debit Note
|
2015-10-28 14:34:48 +05:30 |
|
Nabin Hait
|
15bf4e5599
|
[patch] Deleted Item-wise Last Purchase Rate report
|
2015-10-28 12:48:32 +05:30 |
|
Nabin Hait
|
6d490e530a
|
[fix] Ignore users permission for To Warehouse field in Delivery Note
|
2015-10-28 12:43:45 +05:30 |
|
Sambhaji Kolate
|
fd53991dfa
|
[minor] Update Help Video Links in Buying, CRM, Selling #4233
|
2015-10-27 17:01:27 +05:30 |
|
Anand Doshi
|
c794ca53fb
|
[fix] delete file records created via item.py even if website_image file didn't exist
|
2015-10-27 16:56:42 +05:30 |
|
Nabin Hait
|
99f4b43641
|
bumped to version 6.6.5
|
2015-10-27 11:59:35 +06:00 |
|
Nabin Hait
|
fdeab29e94
|
Removed console.log
|
2015-10-27 11:23:43 +05:30 |
|
Nabin Hait
|
31755b485f
|
Merge pull request #4232 from anandpdoshi/variant-smart-selection
Numeric attribute selector, smart selection of variant based on attribute combinations
|
2015-10-27 11:22:54 +05:30 |
|
Anand Doshi
|
3f3696d1eb
|
[enhancement] [website] numeric attribute selector, smart selection of variant based on attribute combinations
|
2015-10-26 21:55:34 +05:30 |
|
Nabin Hait
|
6c6f3789d0
|
[fix] Is POS trigger
|
2015-10-26 18:01:12 +05:30 |
|
Nabin Hait
|
044c43a5cb
|
Merge pull request #4230 from nabinhait/fix26
minor fix
|
2015-10-26 17:43:17 +05:30 |
|
Nabin Hait
|
83e68bb837
|
minor fix
|
2015-10-26 17:40:31 +05:30 |
|
Nabin Hait
|
415df04834
|
[fix] Account Type in Chart of Accounts
|
2015-10-26 16:43:09 +05:30 |
|
Nabin Hait
|
6d2d6862d6
|
Merge pull request #4228 from nabinhait/exchange_rate
[fix] account currency is not mandatory in get exchange rate
|
2015-10-26 15:27:19 +05:30 |
|
Nabin Hait
|
13a65d52dd
|
Merge pull request #4226 from nabinhait/email_digest
[fix] Events in Email Digest
|
2015-10-26 14:47:09 +05:30 |
|
Nabin Hait
|
6485d4a749
|
[fix] account currency is not mandatory in get exchange rate
|
2015-10-26 14:31:17 +05:30 |
|
Nabin Hait
|
2e63c80523
|
Merge pull request #4220 from nabinhait/fix21
Don't delete tax template and pos profile while deleting company transactions
|
2015-10-26 14:14:44 +05:30 |
|
Nabin Hait
|
23bd21778e
|
[fix] Events in Email Digest
|
2015-10-26 14:14:09 +05:30 |
|
Nabin Hait
|
a3f490890d
|
Merge pull request #4227 from nabinhait/dn_to_wh
[fix] Label changed for Target Warehouse in Delivery Note
|
2015-10-26 13:02:59 +05:30 |
|
Nabin Hait
|
8e3ea32d6d
|
Merge pull request #4222 from nabinhait/tax_rule
Set tax rule based on date
|
2015-10-26 13:02:21 +05:30 |
|
Nabin Hait
|
c4a1a943ef
|
Merge pull request #4221 from nabinhait/fix22
[fix] Value mapping while making bank entry from Expense Claim
|
2015-10-26 13:00:52 +05:30 |
|
Nabin Hait
|
abc0b64b68
|
[fix] Label changed for Target Warehouse in Delivery Note
|
2015-10-26 11:58:43 +05:30 |
|
Nabin Hait
|
00818bfa90
|
Set tax rule based on date
|
2015-10-23 16:26:09 +05:30 |
|
Anand Doshi
|
b9bfe6117e
|
[optimization] Stock Projected Qty report
|
2015-10-23 14:49:09 +05:30 |
|
Nabin Hait
|
7a9f46d9d1
|
[fix] Value mapping while making bank entry from Expense Claim
|
2015-10-23 13:19:01 +05:30 |
|
Nabin Hait
|
a10b52c6e6
|
Don't delete tax template and pos profile while deleting company transactions
|
2015-10-23 13:02:55 +05:30 |
|
Rushabh Mehta
|
5033e7b431
|
[hot] fix stock projected qty
|
2015-10-23 10:51:56 +05:30 |
|
Rushabh Mehta
|
e6791ee78e
|
[fix] digest values in absolute
|
2015-10-23 10:39:46 +05:30 |
|
Anand Doshi
|
1c501b6aac
|
bumped to version 6.6.4
|
2015-10-22 22:32:59 +06:00 |
|
Anand Doshi
|
9a2a6d8fcb
|
[hotfix] setup wizard is_pro_application if not service
|
2015-10-22 22:02:22 +05:30 |
|
Anand Doshi
|
0fbf10797c
|
bumped to version 6.6.3
|
2015-10-22 22:29:21 +06:00 |
|
Anand Doshi
|
58344cbb81
|
[hotfix] setup wizard is_pro_application if not service
|
2015-10-22 21:57:13 +05:30 |
|
Anand Doshi
|
b64b461d53
|
bumped to version 6.6.2
|
2015-10-22 20:06:09 +06:00 |
|
Anand Doshi
|
0b93bdcf40
|
[fix] get_party_gle_currency caching
|
2015-10-22 19:33:08 +05:30 |
|
Anand Doshi
|
0af146cea6
|
bumped to version 6.6.1
|
2015-10-22 19:23:19 +06:00 |
|
Anand Doshi
|
683f756d0f
|
[fix] Fetch company of employee in leave application
|
2015-10-22 18:52:15 +05:30 |
|
Anand Doshi
|
d905204e49
|
[fix] Update expense account in old purchase invoices if missing
|
2015-10-22 18:49:08 +05:30 |
|
Anand Doshi
|
d8bc40d7f0
|
[fix] party gle currency validation
|
2015-10-22 17:55:22 +05:30 |
|
Anand Doshi
|
f9f0e2591f
|
bumped to version 6.6.0
|
2015-10-22 17:42:00 +06:00 |
|
Anand Doshi
|
5810bf70c7
|
[change-log]
|
2015-10-22 17:02:44 +05:30 |
|
Nabin Hait
|
fbe08ec7d0
|
Period Closing Voucher Test Cases
|
2015-10-22 16:21:37 +05:30 |
|
Nabin Hait
|
0045c305ac
|
Period Closing Voucher as per multi currency
|
2015-10-22 16:21:37 +05:30 |
|
Anand Doshi
|
5dd0fb6e2a
|
Merge pull request #4213 from nabinhait/serial_no_fix
[fix] For Serial No Status
|
2015-10-22 15:25:11 +05:30 |
|
Anand Doshi
|
e99fff8d08
|
Merge pull request #4212 from anandpdoshi/leave-application-js-clenup
[minor] leave application cleanup
|
2015-10-22 15:19:57 +05:30 |
|
Nabin Hait
|
398c83afa5
|
[fix] For Serial No Status
|
2015-10-22 15:11:44 +05:30 |
|
Anand Doshi
|
c346484ca4
|
[minor] leave application cleanup
|
2015-10-21 19:56:14 +05:30 |
|
Nabin Hait
|
70b7f7f036
|
minor improvement in patch
|
2015-10-21 17:40:06 +05:30 |
|
Nabin Hait
|
31c51ef914
|
[fix] test case for purchase invoice gle
|
2015-10-21 17:40:06 +05:30 |
|
Nabin Hait
|
be464696cc
|
[fix][patch] Fix wrong gle for Purchase Invoice against Expenses Included in Valuation account
|
2015-10-21 17:40:06 +05:30 |
|
Anand Doshi
|
191b2970e9
|
[translations] updated
|
2015-10-21 16:59:33 +05:30 |
|
Anand Doshi
|
c50f033722
|
[language] Added Ukranian language - українська. Closes frappe/translator#57
|
2015-10-21 16:59:32 +05:30 |
|
Anand Doshi
|
e1e1414894
|
Merge pull request #4195 from anandpdoshi/journal-entry-posting-date
[enhancement] Quick Entry in Journal Entry, remember Posting Date
|
2015-10-21 16:50:40 +05:30 |
|
Anand Doshi
|
d1441245fb
|
[fix] variant website page render
|
2015-10-21 16:36:43 +05:30 |
|
Anand Doshi
|
87da662703
|
[enhancement] Quick Entry in Journal Entry, remember Posting Date
|
2015-10-21 16:27:13 +05:30 |
|
Anand Doshi
|
99ba924303
|
Merge pull request #4207 from rmehta/rename-tool
[feature] rename via console merge with frappe/frappe#1349
|
2015-10-21 14:27:49 +05:30 |
|
Anand Doshi
|
066ff9599a
|
Merge pull request #4206 from neilLasrado/variant
Prevent Template Item from going into infinite loop while saving
|
2015-10-21 14:20:49 +05:30 |
|
Rushabh Mehta
|
33ebaf479d
|
[feature] rename via console merge with frappe/frappe#1349
|
2015-10-21 12:26:37 +05:30 |
|
Neil Trini Lasrado
|
3a573d1a6d
|
Prevent Template Item from going into infinite loop while saving
|
2015-10-21 12:20:06 +05:30 |
|
Rushabh Mehta
|
7f66983309
|
[minor] added column type definition in batch-wise balance history
|
2015-10-21 12:04:27 +05:30 |
|
Rushabh Mehta
|
2c867fdd73
|
[fix] email digest cache
|
2015-10-21 11:13:40 +05:30 |
|
Anand Doshi
|
95dfc2730b
|
[fix] re-run thumbnail patch
|
2015-10-20 19:03:30 +05:30 |
|
Anand Doshi
|
558646c6b8
|
[fix] ignore mandatory when creating customer and contact in cart
|
2015-10-20 18:57:38 +05:30 |
|
Anand Doshi
|
ea0d98891f
|
[minor] don't display missing file doc message in item's make thumbnail
|
2015-10-20 18:57:38 +05:30 |
|
Anand Doshi
|
2678135f5e
|
bumped to version 6.5.3
|
2015-10-20 19:05:49 +06:00 |
|
Anand Doshi
|
25ef4ff373
|
[fix] variant selector display
|
2015-10-20 18:34:21 +05:30 |
|
Anand Doshi
|
3c3d69f905
|
bumped to version 6.5.2
|
2015-10-20 18:23:37 +06:00 |
|
Anand Doshi
|
aed8da40ae
|
Merge pull request #4198 from nabinhait/mc_fix
[fix] Set higher precision for debit, credit and exchange rate field
|
2015-10-20 17:46:22 +05:30 |
|
Anand Doshi
|
3bc43682f1
|
Merge pull request #4199 from neilLasrado/item
Default value of allow production order in Item master changed to 1
|
2015-10-20 17:44:26 +05:30 |
|
Anand Doshi
|
7c0eadb451
|
[fix] Patch template item to be shown in website, show variant's description and price on change of attribute
|
2015-10-20 17:30:02 +05:30 |
|
Neil Trini Lasrado
|
d4357e80d7
|
Fixed Test Cases
|
2015-10-20 16:21:02 +05:30 |
|
Neil Trini Lasrado
|
c0f88e4caf
|
Default value fot allow production order in Item master changed to 1
|
2015-10-20 15:51:04 +05:30 |
|
Anand Doshi
|
73286dd9f5
|
[minor] define email field for Issue
|
2015-10-20 14:53:22 +05:30 |
|
Anand Doshi
|
7b2b0cd73c
|
[fix] Item Re-order if Bin does not exists and fixed Stock Projected Qty report to show per Warehouse Re-order level
|
2015-10-20 14:29:47 +05:30 |
|
Anand Doshi
|
2c749db2a9
|
Merge pull request #4196 from neilLasrado/develop
Fixed issue in Item Variant for Numeric Attributes
|
2015-10-20 14:28:16 +05:30 |
|
Anand Doshi
|
17c633d00f
|
[fix] Set fieldtype of description field as Text Editor in Landed Cost Item
|
2015-10-20 14:26:44 +05:30 |
|
Neil Trini Lasrado
|
a4fad72a65
|
Considered greater precision of value and increment (better code)
|
2015-10-20 12:20:49 +05:30 |
|
Neil Trini Lasrado
|
e65ac00f36
|
Considered greater precision of value and increment
|
2015-10-20 12:20:49 +05:30 |
|
Neil Trini Lasrado
|
75bd0f7cfe
|
Fixed issue in Item Variant for Numeric Attributes
|
2015-10-20 12:20:49 +05:30 |
|
Nabin Hait
|
4d20f3029b
|
[fix] Set fieldtype of description field as Text in Landed Cost Item
|
2015-10-20 12:18:19 +05:30 |
|
Nabin Hait
|
c35b35abca
|
[fix] Set higher precision for exchange rate field
|
2015-10-20 12:11:51 +05:30 |
|
Anand Doshi
|
17dc249841
|
[fix] rollback if exception in bulk rename
|
2015-10-20 12:11:26 +05:30 |
|
Anand Doshi
|
12af47918d
|
[fix] rename tool
|
2015-10-20 12:02:39 +05:30 |
|
Anand Doshi
|
84ca0197e4
|
Merge pull request #4197 from saurabh6790/fixes
[minor][fix] set default fiscal year for holiday list calendar view
|
2015-10-20 11:40:00 +05:30 |
|
Anand Doshi
|
3395e7a2e4
|
[fix] Daily digest date format
|
2015-10-20 08:48:43 +05:30 |
|
Anand Doshi
|
25956d6282
|
[fix] Item thumbnail
|
2015-10-20 08:48:43 +05:30 |
|
Saurabh
|
ba2133cba2
|
[minor][fix] set default fiscal year for holiday list calendar view
|
2015-10-19 19:20:11 +05:30 |
|
Anand Doshi
|
414660313a
|
bumped to version 6.5.1
|
2015-10-19 19:40:58 +06:00 |
|
Anand Doshi
|
c52a601e87
|
Merge pull request #4189 from nabinhait/dn_target_wh_testcase
Test case fixed for swtiching valuation method
|
2015-10-19 19:09:27 +05:30 |
|
Anand Doshi
|
7a869b0dca
|
[hotfix] print in patch
|
2015-10-19 17:33:40 +05:30 |
|
Nabin Hait
|
6f64a78ecf
|
Test case fixed for swtiching valuation method
|
2015-10-19 16:53:35 +05:30 |
|
Nabin Hait
|
608bbc7850
|
Test case fixed for swtiching valuation method
|
2015-10-19 16:53:35 +05:30 |
|
Anand Doshi
|
16b2c51988
|
bumped to version 6.5.0
|
2015-10-19 17:00:33 +06:00 |
|
Anand Doshi
|
76e9ba1e76
|
[change-log]
|
2015-10-19 16:03:34 +05:30 |
|
Anand Doshi
|
9dad86c189
|
Merge pull request #4190 from nabinhait/income_expense_account_query
[fix] Allowed accounts with account type='Income Account' for default income account in item
|
2015-10-19 15:43:32 +05:30 |
|
Anand Doshi
|
5302b46955
|
Merge pull request #4183 from nabinhait/multi_currency_fix
Multi currency fix
|
2015-10-19 15:32:24 +05:30 |
|
Nabin Hait
|
afd14f6f0e
|
[fix] Allowed accounts with account type='Income Account' for default income account in item
|
2015-10-19 15:27:58 +05:30 |
|
Anand Doshi
|
05584d6d8b
|
Merge pull request #4191 from rmehta/email-digest-quotes
[enhancement] add a quote with email digest
|
2015-10-19 15:18:20 +05:30 |
|
Nabin Hait
|
aa015902d5
|
Validate currency of default receivable/payable accounts
|
2015-10-19 15:10:11 +05:30 |
|
Nabin Hait
|
2873f2e7de
|
Validate currency of default receivable/payable accounts
|
2015-10-19 15:10:11 +05:30 |
|
Anand Doshi
|
b4e9c1da64
|
[fix] thumbnail generation for item
|
2015-10-19 12:57:19 +05:30 |
|
Anand Doshi
|
1d093a4039
|
[fix] change attach fields to small text
|
2015-10-19 12:56:29 +05:30 |
|
Rushabh Mehta
|
fe9717cb9c
|
[enhancement] add a quote with email digest
|
2015-10-19 12:35:07 +05:30 |
|
Anand Doshi
|
d665a07621
|
[fix] remove label 'Column Break'
|
2015-10-16 15:44:28 +05:30 |
|
Rushabh Mehta
|
2a1ba886f1
|
[patch-fix]
|
2015-10-15 16:56:53 +05:30 |
|
Rushabh Mehta
|
55f1ea05da
|
[release] Added change log
|
2015-10-15 16:32:36 +05:30 |
|
Rushabh Mehta
|
2e7f9d2b8f
|
[fixes] email digest
|
2015-10-15 16:31:16 +05:30 |
|
Rushabh Mehta
|
3a519f269d
|
Merge pull request #4175 from anandpdoshi/dynamic-linked-with
[fix] exclude gl entry and stock ledger entry in linked with. Depends on frappe/frappe#1339
|
2015-10-15 14:25:18 +05:30 |
|
Rushabh Mehta
|
4c0d0793a3
|
Merge pull request #4174 from saurabh6790/shopping_cart
[fix] order.html rate display
|
2015-10-15 14:01:46 +05:30 |
|
Rushabh Mehta
|
d3b8a74508
|
[test] fix, force values in target warehouse too
|
2015-10-15 13:23:10 +05:30 |
|
Anand Doshi
|
77760db89c
|
[fix] strip whitespace in setup wizard args
|
2015-10-15 12:54:40 +05:30 |
|
Anand Doshi
|
1d23ebb51d
|
[fix] exclude gl entry and stock ledger entry in linked with. Depends on frappe/frappe#1339
|
2015-10-15 12:54:40 +05:30 |
|
Rushabh Mehta
|
ba5b0e8458
|
[test] [fix] print values for failing test
|
2015-10-15 12:45:42 +05:30 |
|
Rushabh Mehta
|
14a908bdec
|
[test] [fix] abs(valuation_rate) for moving average
|
2015-10-15 12:28:20 +05:30 |
|
Rushabh Mehta
|
9f436a7c71
|
[fix] [exchange-rate] let user defined exchange rate take preceedence
|
2015-10-15 11:57:46 +05:30 |
|
Rushabh Mehta
|
746fd90625
|
[fix] [exchange-rate] let user defined exchange rate take preceedence
|
2015-10-15 11:50:38 +05:30 |
|
Rushabh Mehta
|
f861856ed9
|
[fix] do not check purchase invoice uniqueness for cancelled documents
|
2015-10-15 11:37:34 +05:30 |
|
Rushabh Mehta
|
f94f153078
|
[test] fixes
|
2015-10-15 11:31:59 +05:30 |
|
Rushabh Mehta
|
c9bacedbfe
|
[test] fixes
|
2015-10-15 11:00:34 +05:30 |
|
Saurabh
|
c0cee82727
|
[small fixes] frozen customer testcase
|
2015-10-14 18:03:07 +05:30 |
|
Saurabh
|
4c53931363
|
[fixes and test case] test case to avoid duplicate customer name exection
|
2015-10-14 18:03:07 +05:30 |
|
Saurabh
|
53f7e6281c
|
[fix] Duplicate Customer Name Error
|
2015-10-14 18:03:07 +05:30 |
|
Saurabh
|
9f235b891f
|
[fix] order.html rate display
|
2015-10-14 18:03:07 +05:30 |
|
Rushabh Mehta
|
c4d4c7feb0
|
[fix] repost_actual_qty fix
|
2015-10-14 17:37:28 +05:30 |
|
Rushabh Mehta
|
ee6862b277
|
[fix] VARCHAR lengths as 140
|
2015-10-14 17:28:35 +05:30 |
|
Rushabh Mehta
|
fb73151da6
|
[fixes]
|
2015-10-14 16:22:01 +05:30 |
|
Rushabh Mehta
|
6e322d0a02
|
[enhancement] use thumbnails in grid views, patch to make thumbnails
|
2015-10-14 16:21:24 +05:30 |
|
Rushabh Mehta
|
73e73795f1
|
[minor] Added 'Invite User' in Contact
|
2015-10-14 16:20:39 +05:30 |
|
Rushabh Mehta
|
80d2a55342
|
[enhancement] add variants in website
|
2015-10-14 16:16:00 +05:30 |
|
Anand Doshi
|
41dd2c458b
|
[minor] pass does not exist error
|
2015-10-14 16:13:49 +05:30 |
|
Anand Doshi
|
71ebad5668
|
Limit varchar length to 140 instead of 255 to mitigate Row Size Too Large error
|
2015-10-14 16:13:49 +05:30 |
|
Rushabh Mehta
|
73f1dc4edf
|
[cleanup] added unsubscribe to email digest
|
2015-10-14 15:53:37 +05:30 |
|
Rushabh Mehta
|
174299124f
|
[cleanup] [wip] email digest
|
2015-10-14 15:53:37 +05:30 |
|
Rushabh Mehta
|
c27748b2b3
|
Merge pull request #4040 from nabinhait/dn_target_warehouse
Delivery to target warehouse
|
2015-10-14 15:29:54 +05:30 |
|
Rushabh Mehta
|
626ba1bb81
|
[translations] added bn, da-DK, es-PE, si
|
2015-10-14 15:24:42 +05:30 |
|
Nabin Hait
|
38e4c6f2af
|
Allow same serial nos for raw materials and fg item in repack / manufacture entry
|
2015-10-13 18:37:39 +05:30 |
|
Neil Trini Lasrado
|
58e9590850
|
Fixed issues with Permissions in Company Doctype
|
2015-10-13 17:45:43 +05:30 |
|
Nabin Hait
|
03afb45e34
|
[fix] Validate deletion of serial no
|
2015-10-13 15:46:42 +05:30 |
|
Nabin Hait
|
d91382dbf3
|
[fix] serial no status
|
2015-10-13 15:46:42 +05:30 |
|
Nabin Hait
|
e07958bbda
|
Change log and sopnsors for delivery to target warehouse
|
2015-10-13 15:46:42 +05:30 |
|
Nabin Hait
|
b445be3552
|
Test case for delivery to target warehouse
|
2015-10-13 15:46:42 +05:30 |
|
Nabin Hait
|
c865f229fb
|
Target Warehouse in Delivery Note and Sales Invoice and removed Serial No status
|
2015-10-13 15:46:42 +05:30 |
|
Neil Trini Lasrado
|
ec5deb6e48
|
Changed label in Company
|
2015-10-13 15:28:12 +05:30 |
|
Neil Trini Lasrado
|
486bf2e113
|
Added Change Log
|
2015-10-13 15:17:53 +05:30 |
|
Neil Trini Lasrado
|
f49b085625
|
Allowed Income account to be added to Cost Center
|
2015-10-13 14:54:39 +05:30 |
|
Rushabh Mehta
|
4f4fc45ae6
|
bumped to version 6.4.7
|
2015-10-13 15:16:15 +06:00 |
|
Rushabh Mehta
|
86125b2b9f
|
[fix] sales order status for maintenance
|
2015-10-13 12:31:05 +05:30 |
|
Rushabh Mehta
|
22d0d586ab
|
[minor] [typo]
|
2015-10-13 12:30:21 +05:30 |
|
Rushabh Mehta
|
eb62aed8c7
|
Merge pull request #4157 from nabinhait/bin
[fix][patch] Delete duplicate bins
|
2015-10-12 18:39:16 +05:30 |
|
Rushabh Mehta
|
60f1739ca5
|
Merge pull request #4158 from rmehta/journal-entry-title-fix
[fix] set title in Journal Entry only if not set
|
2015-10-12 18:35:49 +05:30 |
|
Rushabh Mehta
|
5f349a67c9
|
Merge pull request #4156 from rmehta/item-section-fix
[fix] [minor] collapsible section for Item - removed custom script
|
2015-10-12 18:35:38 +05:30 |
|
Rushabh Mehta
|
fd294eb981
|
Merge pull request #4154 from rmehta/sales-analytics-fix
[minor] [fix] Use customer_name in Sales Analytics
|
2015-10-12 18:32:39 +05:30 |
|
Rushabh Mehta
|
d256055a8c
|
Merge pull request #4153 from rmehta/stock-entry-fix
[fix] [minor] stock_entry.py error for None qty
|
2015-10-12 18:32:28 +05:30 |
|
Rushabh Mehta
|
cefa106a06
|
Merge pull request #4151 from anandpdoshi/purchase-invoice-letterhead
[fix] Added Letter Head field to Purchase Invoice
|
2015-10-12 18:30:25 +05:30 |
|
Rushabh Mehta
|
67ecfcf52c
|
Merge pull request #4148 from saurabh6790/erp_support
[minor fix], escape % char
|
2015-10-12 18:30:13 +05:30 |
|
Nabin Hait
|
b7e46c4ed9
|
[fix][patch] Delete duplicate bins
|
2015-10-12 18:28:50 +05:30 |
|
Rushabh Mehta
|
bc5ecfff06
|
Merge pull request #4146 from nabinhait/fix10
[fix] Multiple minor fixes
|
2015-10-12 18:27:02 +05:30 |
|
Rushabh Mehta
|
8fa4845d00
|
[fix] set title in Journal Entry only if not set
|
2015-10-12 16:59:52 +05:30 |
|
Rushabh Mehta
|
d4882653c3
|
[fix] [minor] collapsible section for Item - removed custom script
|
2015-10-12 16:45:53 +05:30 |
|
Anand Doshi
|
9a4d165ba2
|
[fix] get_party_details.js - set posting_date if args are initialised
|
2015-10-12 16:23:51 +05:30 |
|
Rushabh Mehta
|
a7099eaa8d
|
[minor] [fix] Use customer_name in Sales Analytics
|
2015-10-12 16:22:10 +05:30 |
|
Anand Doshi
|
4b72d05793
|
[fix] get allocated_percentage from party's sales team
|
2015-10-12 16:15:52 +05:30 |
|
Rushabh Mehta
|
a30f3ea1f9
|
[fix] [minor] stock_entry.py error for None qty
|
2015-10-12 16:12:52 +05:30 |
|
Anand Doshi
|
4fa69780a8
|
[fix] Added Letter Head field to Purchase Invoice
|
2015-10-12 15:55:24 +05:30 |
|
Rushabh Mehta
|
2dc619ae1f
|
[fix] copy task titles with project
|
2015-10-12 15:55:12 +05:30 |
|
Nabin Hait
|
fc9031924e
|
[fix] Field type of Age field converted to Int
|
2015-10-12 15:47:07 +05:30 |
|
Saurabh
|
e14124198d
|
minor fix, escape % char
|
2015-10-12 15:08:09 +05:30 |
|
Nabin Hait
|
51e980dd2c
|
[fix] Multiple minor fixes
|
2015-10-10 18:10:05 +05:30 |
|
Rushabh Mehta
|
c03cba9d17
|
[fix] sales order notification
|
2015-10-08 11:46:32 +05:30 |
|
Nabin Hait
|
9801745090
|
bumped to version 6.4.6
|
2015-10-07 17:57:23 +06:00 |
|
Anand Doshi
|
7866c6e6db
|
[fix] modified in sales order and purchase order
|
2015-10-07 17:26:19 +05:30 |
|
Nabin Hait
|
4c502bcd26
|
bumped to version 6.4.5
|
2015-10-07 15:10:32 +06:00 |
|
Nabin Hait
|
714948c867
|
Merge pull request #4136 from nabinhait/uom
[fix] Fetch UOM Conversion Factor from template if not specified in variants
|
2015-10-07 14:30:18 +05:30 |
|
Nabin Hait
|
8f3b360f83
|
Merge pull request #4133 from saurabh6790/erp_support
Calendar view for holiday listing
|
2015-10-07 14:29:38 +05:30 |
|
Nabin Hait
|
314086d6c0
|
[fix] Fetch UOM Conversion Factor from template if not specified in variants
|
2015-10-07 11:55:08 +05:30 |
|
Nabin Hait
|
bcd655a985
|
Merge pull request #4109 from rmehta/fix-sales-purchase-order-status
[fix] sales & purchase order status
|
2015-10-07 11:34:30 +05:30 |
|
Saurabh
|
b0dbdc1439
|
minor fixes
|
2015-10-07 11:27:25 +05:30 |
|
Nabin Hait
|
37b0bf257d
|
Merge pull request #4117 from nabinhait/sample_data
[fix] Create sample opportunity and quotation only if Customer exists
|
2015-10-07 11:25:50 +05:30 |
|
Nabin Hait
|
c5a25f44e1
|
Merge pull request #4119 from nabinhait/fix3
[fix] Return account currency only if account provided
|
2015-10-07 11:25:19 +05:30 |
|
Nabin Hait
|
8dafa376ab
|
Merge pull request #4123 from nabinhait/fix4
[fix] allowed more than 2 currencies in Journal Entry
|
2015-10-07 11:24:45 +05:30 |
|
Saurabh
|
74eb8e34da
|
[Fixes] minor fix for fiscal year in holiday list
|
2015-10-07 11:17:14 +05:30 |
|
Nabin Hait
|
5c66fb7631
|
Merge pull request #4130 from nabinhait/reports
[fix][report] Left join used in pending reports
|
2015-10-07 11:15:36 +05:30 |
|
Nabin Hait
|
be3b3b2107
|
Merge pull request #4132 from nabinhait/credit_limit
minor fix in credit limit
|
2015-10-07 11:15:02 +05:30 |
|
Nabin Hait
|
8a7bdd5a92
|
[fix] Valuation Rate in Stock Balance report
|
2015-10-06 18:46:56 +05:30 |
|
Saurabh
|
1d753c92b1
|
Calendar view for holiday listing
|
2015-10-06 15:21:23 +05:30 |
|
Nabin Hait
|
54ecc8ebba
|
minor fix in credit limit
|
2015-10-06 14:28:41 +05:30 |
|
Nabin Hait
|
f4edaef481
|
[fix][report] Left join used in pending reports
|
2015-10-06 12:48:04 +05:30 |
|
Nabin Hait
|
ebbd163903
|
[fix] allowed more than 2 currencies in Journal Entry
|
2015-10-05 13:21:38 +05:30 |
|
Nabin Hait
|
8954b24b22
|
[fix] Return account currency only if account provided
|
2015-10-04 12:27:46 +05:30 |
|
Nabin Hait
|
ae92fc7f35
|
[fix] Create sample opportunity and quotation only if Customer exists
|
2015-10-03 13:42:44 +05:30 |
|
Rushabh Mehta
|
0bc3ca02f3
|
[fix] default contact for website
|
2015-10-03 12:08:43 +05:30 |
|
Rushabh Mehta
|
d10ba853e6
|
[fix] sales & purchase order status
|
2015-10-02 17:16:51 +05:30 |
|
Anand Doshi
|
789a798e36
|
bumped to version 6.4.4
|
2015-10-02 17:05:36 +06:00 |
|
Nabin Hait
|
fbef1fdf3a
|
Minor fix
|
2015-10-02 16:26:18 +05:30 |
|
Nabin Hait
|
7a287a9153
|
[patch] Fix affected Journal Entries due to reconciliation
|
2015-10-02 16:00:42 +05:30 |
|
Anand Doshi
|
71f23acc2b
|
bumped to version 6.4.3
|
2015-10-02 13:13:27 +06:00 |
|
Anand Doshi
|
1a1f790150
|
[fix] test case
|
2015-10-02 12:34:18 +05:30 |
|
Rushabh Mehta
|
3c54e9779b
|
Merge pull request #4108 from nabinhait/payment_reco
[fix] Payment Reconciliation in multi-currency
|
2015-10-02 12:32:54 +05:30 |
|
Nabin Hait
|
db48b7d764
|
[fix] Payment Reconciliation in multi-currency
|
2015-10-02 12:05:55 +05:30 |
|
Rushabh Mehta
|
83c0899c83
|
[fix] [minor] default ranges for demo
|
2015-10-02 11:31:37 +05:30 |
|
Anand Doshi
|
d9ab725be4
|
[fix] In Payment Tool, Set Payment Amount = Outstanding Amount if checked
|
2015-10-01 19:17:02 +05:30 |
|
Anand Doshi
|
7afaeb0820
|
[fix] the case when party account currency is missing
|
2015-10-01 18:55:43 +05:30 |
|
Anand Doshi
|
ba48f82e03
|
bumped to version 6.4.2
|
2015-10-01 14:31:22 +06:00 |
|
Anand Doshi
|
8e7e128e81
|
Merge pull request #4104 from nabinhait/addresses_and_contacts
[fix] get permission query condition if no permitted links
|
2015-10-01 14:00:38 +05:30 |
|
Anand Doshi
|
0353569e8b
|
Merge pull request #4103 from nabinhait/monthly_attendance_sheet
[fix] Month issue fixed in Monthly Attendance Sheet
|
2015-10-01 13:58:33 +05:30 |
|
Anand Doshi
|
665e2f5418
|
Merge pull request #4100 from nabinhait/general_ledger_report
[fix] General Ledger report fixed
|
2015-10-01 13:56:13 +05:30 |
|
Nabin Hait
|
dace2b6796
|
[fix] get permission query condition if no permitted links
|
2015-10-01 13:54:46 +05:30 |
|
Nabin Hait
|
712b02593a
|
[fix] Month issue fixed in Monthly Attendance Sheet
|
2015-10-01 12:35:54 +05:30 |
|
Nabin Hait
|
f924e08b93
|
[fix] Validate duplicate email ids in Lead
|
2015-10-01 11:51:48 +05:30 |
|
Nabin Hait
|
5c623dae4d
|
[fix] General Ledger report fixed
|
2015-10-01 11:22:15 +05:30 |
|
Anand Doshi
|
e2c3d40b57
|
[hotfix] Payment Reconciliation Invoice Type
|
2015-10-01 11:21:26 +05:30 |
|
Anand Doshi
|
673887455f
|
[fix] Show Contribution (%) in Sales Team table in Customer Form
|
2015-10-01 11:21:25 +05:30 |
|
Anand Doshi
|
bf7294cf5c
|
bumped to version 6.4.1
|
2015-09-30 21:20:59 +06:00 |
|
Nabin Hait
|
72d2d682ae
|
Repost GL Entries for Journal Entries where reference name is missing
|
2015-09-30 18:50:54 +05:30 |
|
Anand Doshi
|
21f6ea6f7e
|
[hotfix] remove allow on submit from item tables
|
2015-09-30 18:45:29 +05:30 |
|
Anand Doshi
|
f3006972d5
|
bumped to version 6.4.0
|
2015-09-30 17:53:52 +06:00 |
|
Anand Doshi
|
dccc6bc11d
|
[change-log]
|
2015-09-30 17:19:51 +05:30 |
|
Anand Doshi
|
15d2c89939
|
Merge remote-tracking branch 'upstream/master' into develop
Conflicts:
erpnext/accounts/report/general_ledger/general_ledger.py
|
2015-09-30 17:13:58 +05:30 |
|
Anand Doshi
|
ca4c8a2a46
|
[translations]
|
2015-09-30 17:10:58 +05:30 |
|
Anand Doshi
|
c320fe541d
|
Merge pull request #4067 from anandpdoshi/remove-party-account-currency
Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account
|
2015-09-30 16:55:24 +05:30 |
|
Anand Doshi
|
f40a87511e
|
Merge pull request #4091 from rmehta/repack-allow-low-rate
[fix] remove validation to disallow lower rate
|
2015-09-30 16:46:31 +05:30 |
|
Anand Doshi
|
4945b94950
|
[fix] added validation to match account currency with existing gle and test case
|
2015-09-30 16:41:15 +05:30 |
|
Rushabh Mehta
|
cb96b61449
|
[fix] remove validation to disallow lower rate
|
2015-09-30 16:22:05 +05:30 |
|
Anand Doshi
|
248c867a2c
|
[minor] removed test case for party multi-currency validation, since party multi-currency is now based on account
|
2015-09-30 15:11:13 +05:30 |
|
Anand Doshi
|
da98ab6f3c
|
[fix] Only 1 account per company for a party
|
2015-09-30 15:11:12 +05:30 |
|
Anand Doshi
|
cd0989e051
|
Added method get_account_currency
|
2015-09-30 15:11:12 +05:30 |
|
Anand Doshi
|
b20baf894f
|
[fix] Remove party_account_currency from Customer and Supplier, and use currency derived from get_party_account
|
2015-09-30 15:11:12 +05:30 |
|
Nabin Hait
|
d3cf4f1264
|
Merge pull request #4075 from anandpdoshi/journal-entry-get-exchange-rate
return exchange rate as 1 if no account is specified
|
2015-09-30 15:05:41 +05:30 |
|
Anand Doshi
|
2dbe2b63b2
|
Merge pull request #4088 from anandpdoshi/address-contact-permissions
Apply permissions on address and contact based on permissions of Customer, Supplier
|
2015-09-30 12:19:50 +05:30 |
|
Anand Doshi
|
edba8f5582
|
[fix] Print 'Attach' field in Stock Entry Detail
|
2015-09-30 11:50:08 +05:30 |
|
Anand Doshi
|
89b8d11f9c
|
[fix] Apply permissions on address and contact based on permissions of Customer, Supplier
|
2015-09-29 20:11:57 +05:30 |
|
Anand Doshi
|
19a33994da
|
[cleanup] removed desk_home and desk_home_flows from conf.js
|
2015-09-29 20:06:22 +05:30 |
|
Rushabh Mehta
|
89349d3ae3
|
[fix] [payment-reconciliation] ignore rows with blank invoice numbers
|
2015-09-29 16:39:53 +05:30 |
|
Rushabh Mehta
|
4bcbcd29f7
|
[enhancement] lower priority for newsletter emails
|
2015-09-29 14:58:45 +05:30 |
|
Anand Doshi
|
740a11263f
|
[minor] validate invoice number is selected in Payment Reconciliation
|
2015-09-29 12:55:11 +05:30 |
|
Anand Doshi
|
142859f36e
|
Merge pull request #4076 from anandpdoshi/shopping-cart-order
check doc.has_website_permission in order.html. Merge after frappe/frappe#1316
|
2015-09-28 19:40:17 +05:30 |
|
Anand Doshi
|
6534ad082d
|
Merge pull request #4069 from anandpdoshi/round-status-updater-percentages
Round status update percentages to 2 decimals
|
2015-09-28 19:40:01 +05:30 |
|
Rushabh Mehta
|
7f75dbf061
|
[cleanup] remove backup manager
|
2015-09-28 19:12:54 +05:30 |
|
Anand Doshi
|
199d8a44fc
|
[fix] check doc.has_website_permission in order.html
|
2015-09-28 19:04:42 +05:30 |
|
Rushabh Mehta
|
72b1128467
|
[fixes] accounts controller add flt
|
2015-09-28 17:29:46 +05:30 |
|
Anand Doshi
|
d6cb55ad1a
|
[fix] return exchange rate as 1 if no account is specified
|
2015-09-28 17:20:02 +05:30 |
|
Anand Doshi
|
c76e34d7de
|
[fix] In get_bom_items_as_dict don't filter by is_pro_applicable for multi-level bom
|
2015-09-28 17:01:44 +05:30 |
|
Anand Doshi
|
33b10faf94
|
Merge pull request #4074 from anandpdoshi/multi-level-bom-fetch
[fix] In get_bom_items_as_dict don't filter by is_pro_applicable for multi-level bom
|
2015-09-28 17:00:52 +05:30 |
|
Anand Doshi
|
d970b001a4
|
[fix] Round status update percentages to 2 decimals
|
2015-09-28 16:52:22 +05:30 |
|
Anand Doshi
|
d767fb6134
|
[fix] In get_bom_items_as_dict don't filter by is_pro_applicable for multi-level bom
|
2015-09-28 16:44:48 +05:30 |
|
gmarke
|
e5a31462fe
|
Update get_item_details.py
like this it will be possible to correctly handle cost center for stock entries when no default cost center per company is set
|
2015-09-27 09:38:01 +02:00 |
|
Anand Doshi
|
6f39300d43
|
Merge pull request #4068 from anandpdoshi/due-date-validation
if no party, don't validate due date based on credit days
|
2015-09-25 17:31:33 +05:30 |
|
Anand Doshi
|
0ca587e018
|
[fix] if no party, don't validate due date based on credit days
|
2015-09-25 16:32:14 +05:30 |
|
Rushabh Mehta
|
8ffe12ebe4
|
[chart-of-accounts] added default for Guatemala
|
2015-09-25 15:40:33 +05:30 |
|
Anand Doshi
|
8579af371c
|
Merge pull request #4057 from rmehta/gl-report-fix
GL Report Fix
|
2015-09-25 12:30:26 +05:30 |
|
Rushabh Mehta
|
b5ff9421e1
|
[optimize] customer outstanding query
|
2015-09-25 12:25:12 +05:30 |
|
Nabin Hait
|
44bd3b2601
|
[fix] Fetch gl entries in receivable/payable report only if party mentioned
|
2015-09-25 10:33:51 +05:30 |
|
Nabin Hait
|
1b6c00e2c7
|
[report] Trial Balance for Party
|
2015-09-25 09:18:03 +05:30 |
|
Anand Doshi
|
f723032fd7
|
bumped to version 6.3.2
|
2015-09-24 18:01:11 +06:00 |
|
Anand Doshi
|
3297c43bdf
|
[fix] Tax Rule permission to Account Manager
|
2015-09-24 17:29:28 +05:30 |
|
Anand Doshi
|
aea250bc5a
|
[fix] [patch] fix missing default lead
|
2015-09-24 16:31:36 +05:30 |
|
Anand Doshi
|
d37d4dfdec
|
[fix] applicable territory patch and tax rule tests
|
2015-09-24 15:44:39 +05:30 |
|
Anand Doshi
|
7f96c20f5b
|
bumped to version 6.3.1
|
2015-09-24 15:53:05 +06:00 |
|
Anand Doshi
|
e75d947867
|
[fix] [patch] convert applicable territory
|
2015-09-24 15:22:12 +05:30 |
|
Anand Doshi
|
bba0a5d38f
|
[fix] [patch] tax rule
|
2015-09-24 15:11:24 +05:30 |
|
Anand Doshi
|
953e97536a
|
[fix] [patch] tax rule
|
2015-09-24 15:05:06 +05:30 |
|
Anand Doshi
|
e74d7ca33e
|
[fix] [patch] tax rule
|
2015-09-24 15:04:15 +05:30 |
|
Rushabh Mehta
|
8f2b8afcb7
|
[fix] gl entry report if not filtered
|
2015-09-24 15:03:53 +05:30 |
|
Anand Doshi
|
b3f12c3109
|
[fix] [patch] convert_applicable_territory
|
2015-09-24 15:01:27 +05:30 |
|
Anand Doshi
|
f66e6aacd4
|
[fix] [patch] convert_applicable_territory
|
2015-09-24 14:59:26 +05:30 |
|
Anand Doshi
|
ab57e52cbd
|
bumped to version 6.3.0
|
2015-09-24 15:05:35 +06:00 |
|
Anand Doshi
|
e63da9813c
|
Merge remote-tracking branch 'frappe/master' into develop
Conflicts:
erpnext/patches.txt
|
2015-09-24 14:34:50 +05:30 |
|
Anand Doshi
|
c020e42d20
|
[fix] [patch] convert applicable territory
|
2015-09-24 13:08:35 +05:30 |
|
Anand Doshi
|
b126ba0132
|
[change-log]
|
2015-09-24 13:06:00 +05:30 |
|
Anand Doshi
|
c6e4b5978d
|
[fix] Sales Order - get_query fix
|
2015-09-24 11:32:54 +05:30 |
|
Anand Doshi
|
361eca4cae
|
Merge pull request #4054 from anandpdoshi/sales-team-update-after-submit
Sales Team editable after submit
|
2015-09-24 11:30:31 +05:30 |
|
Anand Doshi
|
9fc03b6c10
|
Merge pull request #4052 from rmehta/fix-operation-name
[fix] minor, remove operation naming field from operation
|
2015-09-24 11:30:07 +05:30 |
|
Anand Doshi
|
e2d46d0474
|
[fix] Allow Sales Team to be added/updated after submit
|
2015-09-23 19:26:29 +05:30 |
|
Rushabh Mehta
|
dd2f2f5321
|
[fix] minor, remove operation naming field from operation
|
2015-09-23 17:06:01 +05:30 |
|
Anand Doshi
|
6e4f5a214a
|
Merge pull request #4033 from rmehta/portal-fixes
Portal Fixes
|
2015-09-23 16:05:12 +05:30 |
|
Anand Doshi
|
b07b0a9e54
|
[fix] Sales Order indicators for Maintenance
|
2015-09-23 15:52:11 +05:30 |
|
Rushabh Mehta
|
307978fea9
|
[test-fixes]
|
2015-09-23 15:43:09 +05:30 |
|
Anand Doshi
|
06ad308ca1
|
[fixes] setup wizard and other fixes related to cart
|
2015-09-23 12:50:35 +05:30 |
|
Anand Doshi
|
52dfc32eca
|
[fix] validate_valuation_rate for Repack
|
2015-09-23 12:50:35 +05:30 |
|
Rushabh Mehta
|
72fbf902d7
|
[cleanup] added single price list for shopping cart, removed Applicable Territory
|
2015-09-23 12:50:34 +05:30 |
|
Rushabh Mehta
|
8ffd483e24
|
[wip] shopping cart shipping rule, price list cleanup
|
2015-09-23 12:49:16 +05:30 |
|
Rushabh Mehta
|
3d76686b82
|
[shopping-cart] cart via Jinja WIP
|
2015-09-23 12:49:16 +05:30 |
|
Rushabh Mehta
|
156ce607e2
|
[cleanup] [wip] portal, shopping cart cleanup
|
2015-09-23 12:49:16 +05:30 |
|
Anand Doshi
|
65b6762247
|
Merge pull request #4049 from bobzz-zone/patch-11
Update item_grid.html
|
2015-09-23 12:09:26 +05:30 |
|
Rushabh Mehta
|
abdfb4d3db
|
[fixed] New button in POS Sales Invoice, reported via forum
|
2015-09-23 12:05:51 +05:30 |
|
bobzz-zone
|
3bcb13b1b8
|
Update item_grid.html
Change the colour of the indicator to be green when delivered qty is bigger than ordered qty
|
2015-09-23 11:42:06 +07:00 |
|
Anand Doshi
|
b6ec680c46
|
[fix] round percentages in get_indicator
|
2015-09-22 16:36:20 +05:30 |
|
Anand Doshi
|
53a0de7607
|
[fix] Recalculate rate after applying Pricing Rule
|
2015-09-22 15:26:53 +05:30 |
|
Anand Doshi
|
0a1d037f01
|
Merge pull request #3974 from rmehta/dms
[enhancement] document management system
|
2015-09-22 14:51:01 +05:30 |
|
Nabin Hait
|
5b649521d1
|
[fix] Get outstanding invoices in Payment Reconciliation and Payment Tool
|
2015-09-22 13:06:34 +05:30 |
|
Anand Doshi
|
798e75832c
|
[fix] Show payment's invoice number as 'Invoice Type | Invoice Number' for better unsability
|
2015-09-22 12:59:43 +05:30 |
|
Nabin Hait
|
c0c94aef44
|
[fix] Get outstanding invoices in Payment Reconciliation and Payment Tool
|
2015-09-22 08:37:37 +05:30 |
|
Anand Doshi
|
e4dfeb651f
|
[optimization] get balance on
|
2015-09-21 19:31:43 +05:30 |
|
Anand Doshi
|
f7e6eb4fd7
|
[optimization] get balance on
|
2015-09-21 19:30:21 +05:30 |
|
Rushabh Mehta
|
97c858a5e3
|
[fix] pull sales team from customer
|
2015-09-21 10:03:38 +05:30 |
|
Rushabh Mehta
|
974892bf87
|
Merge pull request #4036 from rmehta/no-party-currency
[fix] no default party currency
|
2015-09-18 13:40:42 +05:30 |
|
Rushabh Mehta
|
361df8993f
|
[fix] no default party currency
|
2015-09-18 12:59:51 +05:30 |
|
Anand Doshi
|
b8b8de7a49
|
[hotfix] multicurrency gl entry
|
2015-09-17 21:07:45 +05:30 |
|
Anand Doshi
|
be6cfddc4d
|
[hotfix] multicurrency gl entry
|
2015-09-17 21:07:04 +05:30 |
|
Anand Doshi
|
bf8c8df9ce
|
Revert "[hotfix] set_balance_in_account_currency"
This reverts commit 9acd6a2629.
|
2015-09-17 20:55:50 +05:30 |
|
Anand Doshi
|
40759c284c
|
Revert "[hotfix] set_balance_in_account_currency"
This reverts commit 9acd6a2629.
|
2015-09-17 20:51:41 +05:30 |
|