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 |
|
Rushabh Mehta
|
89349d3ae3
|
[fix] [payment-reconciliation] ignore rows with blank invoice numbers
|
2015-09-29 16:39:53 +05:30 |
|
Anand Doshi
|
f6a31a568a
|
Merge pull request #4085 from rmehta/bulk-priority
[enhancement] lower priority for newsletter emails
|
2015-09-29 15:25:13 +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 |
|
Anand Doshi
|
6361ae3495
|
Merge branch 'rmehta-backup-cleanup' into develop
|
2015-09-28 19:38:06 +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 |
|
Rushabh Mehta
|
6239923340
|
Merge pull request #4071 from gmarke/patch-2
Update get_item_details.py
|
2015-09-28 10:18:56 +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 |
|
Rushabh Mehta
|
ba8ec17f0b
|
Merge pull request #4065 from nabinhait/receivable_payable
[fix] Fetch gl entries in receivable/payable report only if party mentioned
|
2015-09-25 11:34:14 +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 |
|
Rushabh Mehta
|
9d40eca428
|
Merge pull request #4064 from nabinhait/trial_balance_for_party
[report] Trial Balance for Party
|
2015-09-25 10:01:44 +05:30 |
|
Nabin Hait
|
1b6c00e2c7
|
[report] Trial Balance for Party
|
2015-09-25 09:18:03 +05:30 |
|
Anand Doshi
|
52efde31e7
|
Merge branch 'develop'
|
2015-09-24 17:31:12 +05:30 |
|