Anand Doshi
|
5bcf8315de
|
Merge branch 'develop'
|
2015-10-02 16:35:36 +05:30 |
|
Anand Doshi
|
789a798e36
|
bumped to version 6.4.4
|
2015-10-02 17:05:36 +06:00 |
|
Nabin Hait
|
ee1169dac7
|
Merge pull request #4112 from nabinhait/fix1
Minor fix
|
2015-10-02 16:27:49 +05:30 |
|
Nabin Hait
|
fbef1fdf3a
|
Minor fix
|
2015-10-02 16:26:18 +05:30 |
|
Anand Doshi
|
4358e1cd46
|
Merge pull request #4111 from nabinhait/payment_reco_patch
[patch] Fix affected Journal Entries due to reconciliation
|
2015-10-02 16:05:03 +05:30 |
|
Nabin Hait
|
7a287a9153
|
[patch] Fix affected Journal Entries due to reconciliation
|
2015-10-02 16:00:42 +05:30 |
|
Anand Doshi
|
5a49ded5d9
|
Merge branch 'develop'
|
2015-10-02 12:43:27 +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 |
|
Nabin Hait
|
e5047ec90a
|
Merge pull request #4106 from anandpdoshi/payment-tool-amount
In Payment Tool, Set Payment Amount = Outstanding Amount if checked
|
2015-10-02 10:39:57 +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
|
da2d8b958d
|
Merge branch 'develop'
|
2015-10-01 14:01:22 +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 |
|
Anand Doshi
|
d2a60fd727
|
Merge pull request #4102 from nabinhait/lead_email
[fix] Validate duplicate email ids in Lead
|
2015-10-01 12:07:37 +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
|
63199e486b
|
Merge branch 'develop'
|
2015-09-30 20:51:00 +05:30 |
|
Anand Doshi
|
bf7294cf5c
|
bumped to version 6.4.1
|
2015-09-30 21:20:59 +06:00 |
|
Anand Doshi
|
8aa06a809a
|
Merge pull request #4096 from nabinhait/jv_reference
Repost GL Entries for Journal Entries where reference name is missing
|
2015-09-30 19:44:21 +05:30 |
|
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
|
185f488c51
|
Merge branch 'develop'
|
2015-09-30 17:23:52 +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 |
|