Giovanni Lion
|
5ccaf6f9d7
|
Merge remote-tracking branch 'frappe/develop' into develop
|
2015-12-09 15:25:47 +08:00 |
|
Anand Doshi
|
29fe53f63c
|
[fix] use pip parse requirements in setup.py
|
2015-12-09 12:15:22 +05:30 |
|
Nabin Hait
|
a68a3b5cc1
|
Merge branch 'develop'
|
2015-12-08 18:06:25 +05:30 |
|
Nabin Hait
|
3931a35e27
|
bumped to version 6.12.6
|
2015-12-08 18:36:25 +06:00 |
|
Nabin Hait
|
56595ecda0
|
Merge pull request #4445 from nabinhait/patch_fix1
[patch][fix] Fixed drop ship status and tax rule patch
|
2015-12-08 18:05:33 +05:30 |
|
Nabin Hait
|
466ff3d31b
|
Merge pull request #4446 from nabinhait/translation_fix
[fix] Hungary translation for chart of accounts
|
2015-12-08 18:05:12 +05:30 |
|
Nabin Hait
|
61c6552434
|
[fix] Hungary translation for chart of accounts
|
2015-12-08 18:03:23 +05:30 |
|
Nabin Hait
|
4ad0963ee8
|
[patch][fix] Fixed drop ship status and tax rule patch
|
2015-12-08 16:51:04 +05:30 |
|
Nabin Hait
|
aa99fe2c4e
|
Merge branch 'develop'
|
2015-12-08 15:40:17 +05:30 |
|
Nabin Hait
|
d56ec92682
|
bumped to version 6.12.5
|
2015-12-08 16:10:17 +06:00 |
|
Nabin Hait
|
90852d334f
|
Merge branch 'nabinhait-tax_rule_patch' into develop
|
2015-12-08 15:30:32 +05:30 |
|
Nabin Hait
|
694373d022
|
Fixed conflict
|
2015-12-08 15:30:15 +05:30 |
|
Nabin Hait
|
40d49ccf98
|
Merge pull request #4444 from nabinhait/get_incoming_rate_fix
[fix] Get incoming rate if args as json
|
2015-12-08 15:17:32 +05:30 |
|
Nabin Hait
|
4372ac559a
|
Merge pull request #4443 from nabinhait/bank_reco_print
[fix] Print format for bank reco statement
|
2015-12-08 15:17:24 +05:30 |
|
Nabin Hait
|
01478b3fc1
|
Merge pull request #4439 from saurabh6790/drop-ship-fixes-3
[fixes] Drop Shipping - Purchase Order Cancellation - Sales Order Status
|
2015-12-08 15:16:38 +05:30 |
|
Nabin Hait
|
41c8cf645a
|
[fix] Get incoming rate if args as json
|
2015-12-08 14:50:24 +05:30 |
|
Saurabh
|
70ed6ede5c
|
[fixes] patch to update delivery status for drop ship item
|
2015-12-08 14:48:19 +05:30 |
|
Nabin Hait
|
7af5c4aefc
|
[fix] Print format for bank reco statement
|
2015-12-08 14:25:10 +05:30 |
|
Saurabh
|
01ca354d52
|
[fixes] Drop Shipping - Purchase Order Cancellation - Sales Order Status
|
2015-12-08 14:03:09 +05:30 |
|
Nabin Hait
|
a974ab3dc5
|
[fix][patch] Create Tax Rule based on default taxes and charges template in Customer and Supplier
|
2015-12-08 12:56:14 +05:30 |
|
Anand Doshi
|
cc24d28ddc
|
[fix] address creation for new user
|
2015-12-08 12:34:13 +05:30 |
|
Rushabh Mehta
|
441b2c7657
|
[minor] limit pos search to 24 items at a time
|
2015-12-08 12:16:53 +05:30 |
|
Anand Doshi
|
51d07dfca2
|
[docs] rename perm level error article
|
2015-12-07 16:22:57 +05:30 |
|
Nabin Hait
|
5e6757f197
|
Merge branch 'develop'
|
2015-12-07 14:25:00 +05:30 |
|
Nabin Hait
|
6a8ff42a5a
|
bumped to version 6.12.4
|
2015-12-07 14:54:59 +06:00 |
|
Nabin Hait
|
06db236aa0
|
[fix] Allow Production Order, by default unchecked in item
|
2015-12-07 14:19:13 +05:30 |
|
Nabin Hait
|
733680bc3f
|
[translations]
|
2015-12-07 14:12:41 +05:30 |
|
Rushabh Mehta
|
14a0441b4b
|
[fix] removed temp_highlight
|
2015-12-07 12:28:03 +05:30 |
|
Rushabh Mehta
|
a311e706b0
|
[docs] home.png
|
2015-12-07 12:13:17 +05:30 |
|
Rushabh Mehta
|
e6a16c29df
|
[docs] index fix
|
2015-12-07 12:07:01 +05:30 |
|
Nabin Hait
|
92bb480fc3
|
Merge pull request #4432 from bohlian/develop
Purchase Invoice - Show Payment Button when Outstanding Amount !=0
|
2015-12-07 11:12:11 +05:30 |
|
Nabin Hait
|
7dc0da18b5
|
Merge pull request #4433 from nabinhait/expense_allow_import
[fix] Allowed import for Expense Claim
|
2015-12-07 11:11:35 +05:30 |
|
Nabin Hait
|
c8a2b94200
|
Merge pull request #4434 from nabinhait/whitelist_fix
[fix] get_incoming_rate function whitelisted
|
2015-12-07 11:11:21 +05:30 |
|
Nabin Hait
|
203d4088fa
|
Merge pull request #4435 from saurabh6790/drop-ship-fixes-3
[fixes] recreate print format, shipping address on po for drop ship, …
|
2015-12-07 11:10:11 +05:30 |
|
Nabin Hait
|
5eefff13a1
|
[fix] get_incoming_rate function whitelisted
|
2015-12-07 10:44:56 +05:30 |
|
Nabin Hait
|
9421e9873a
|
[fix] Allowed import for Expense Claim
|
2015-12-07 10:40:13 +05:30 |
|
bohlian
|
5e4c8a52ee
|
Payment To Be Shown When Outstanding Amount != 0
Payment button should be shown when outstanding amount != 0.
|
2015-12-07 12:06:08 +08:00 |
|
bohlian
|
41f62f7250
|
Merge pull request #1 from frappe/develop
7/12/2015 Merge
|
2015-12-07 12:04:34 +08:00 |
|
Saurabh
|
4f39fd243e
|
[fixes] recreate print format, shipping address on po for drop ship, validate update stock
|
2015-12-06 10:09:06 +05:30 |
|
Nabin Hait
|
c43a11a313
|
Merge pull request #4431 from nabinhait/leave_fix
[fix] Don't validate balance for lwp and in balance consider all leaves in the allocation period
|
2015-12-05 12:43:38 +05:30 |
|
Nabin Hait
|
1bffb42809
|
Merge pull request #4428 from nabinhait/get_exchange_rate
[fix] Get exchange rate as 1 if same currency
|
2015-12-05 12:43:13 +05:30 |
|
Nabin Hait
|
4660f820da
|
Merge pull request #4427 from nabinhait/offer_letter_fix
[fix] Offer letter print format fixed
|
2015-12-05 12:42:39 +05:30 |
|
Nabin Hait
|
1a19c05ef0
|
Merge pull request #4425 from nabinhait/bank_reco_fix
[fix] Fixed amounts not reflected in bank
|
2015-12-05 12:42:20 +05:30 |
|
Nabin Hait
|
d53e780fb8
|
[fix] Don't validate balance for lwp and in balance consider all leaves in the allocation period
|
2015-12-05 12:15:49 +05:30 |
|
Nabin Hait
|
0f5d97a156
|
[fix] Get exchange rate as 1 if same currency
|
2015-12-04 16:47:34 +05:30 |
|
Rushabh Mehta
|
2f273674e9
|
[docs] fixed links
|
2015-12-04 16:00:38 +05:30 |
|
Nabin Hait
|
734a40ad62
|
[fix] Offer letter print format fixed
|
2015-12-04 12:19:21 +05:30 |
|
Nabin Hait
|
9547b774f7
|
[fix] Fixed amounts not reflected in bank
|
2015-12-04 11:05:25 +05:30 |
|
Rushabh Mehta
|
e1f8b1d695
|
[minor] [production planning tool] include non production items without default BOM in multi-level BOM
|
2015-12-04 10:53:15 +05:30 |
|
Rushabh Mehta
|
7be2e985b0
|
[docs] updated generated docs
|
2015-12-03 18:28:19 +05:30 |
|