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 |
|
Nabin Hait
|
a48d754158
|
[fix] minor issue
|
2015-09-17 20:37:07 +05:30 |
|
Anand Doshi
|
26bcd89d10
|
[hotfix] journal entry - get balance
|
2015-09-17 20:36:44 +05:30 |
|
Anand Doshi
|
20fd360a63
|
[hotfix] journal entry - get balance
|
2015-09-17 20:36:19 +05:30 |
|
Anand Doshi
|
df8efce36f
|
[hotfix] set_balance_in_account_currency
|
2015-09-17 20:29:57 +05:30 |
|
Anand Doshi
|
9acd6a2629
|
[hotfix] set_balance_in_account_currency
|
2015-09-17 20:29:31 +05:30 |
|
Nabin Hait
|
a8ef4c9220
|
[fix] minor issue
|
2015-09-17 19:38:11 +05:30 |
|
Anand Doshi
|
ce6b61b41e
|
[fix] customer naming series validation and patch to fix missing default taxes and lead
|
2015-09-17 19:02:59 +05:30 |
|
Anand Doshi
|
0332f83bc2
|
[fix] customer naming series validation and patch to fix missing default taxes and lead
|
2015-09-17 19:01:48 +05:30 |
|
Nabin Hait
|
926ae17e5a
|
Update journal_entry.py
|
2015-09-17 18:42:55 +05:30 |
|
Nabin Hait
|
8adb5f3e32
|
Update journal_entry.py
|
2015-09-17 18:40:35 +05:30 |
|
Anand Doshi
|
5532a14938
|
[hotfix] create customer contact and address from lead only on create
|
2015-09-17 18:27:56 +05:30 |
|
Anand Doshi
|
a69682c4e0
|
[hotfix] create customer contact and address from lead only on create
|
2015-09-17 18:27:36 +05:30 |
|
Anand Doshi
|
d20120e649
|
[fix] remove duplicate newsletter subscribers
|
2015-09-17 17:47:26 +05:30 |
|
Anand Doshi
|
e9b14e497b
|
[fix] remove duplicate newsletter subscribers
|
2015-09-17 17:46:40 +05:30 |
|
Anand Doshi
|
ba0bf9e13d
|
[hotfix] multicurrency patch
|
2015-09-17 17:36:20 +05:30 |
|
Anand Doshi
|
cba5a684cb
|
[hotfix] multicurrency patch
|
2015-09-17 17:36:05 +05:30 |
|
Anand Doshi
|
c439b87ccc
|
[hotfix] multicurrency patch
|
2015-09-17 17:28:58 +05:30 |
|
Anand Doshi
|
340709b2da
|
[hotfix] multicurrency patch
|
2015-09-17 17:28:39 +05:30 |
|
Nabin Hait
|
a8de61e24b
|
[fix] Multi currency patch
|
2015-09-17 17:16:58 +05:30 |
|
Nabin Hait
|
9ff52cd57e
|
[fix] Multi currency patch
|
2015-09-17 17:07:26 +05:30 |
|
Rushabh Mehta
|
e3401182c8
|
Merge pull request #4012 from saurabh6790/cart
Taxation for Shopping Cart based on Tax Rule template
|
2015-09-17 16:26:35 +05:30 |
|
Anand Doshi
|
0401e418be
|
bumped to version 6.2.0
|
2015-09-17 16:05:08 +06:00 |
|
Anand Doshi
|
ff6fd7fa9d
|
[change-log]
|
2015-09-17 15:27:01 +05:30 |
|
Anand Doshi
|
6489e97726
|
[translations]
|
2015-09-17 15:08:09 +05:30 |
|
Nabin Hait
|
77ca80217c
|
[fix] Account Currency and Balance fixed in chart of accounts #4019
|
2015-09-17 14:43:33 +05:30 |
|
Nabin Hait
|
8247ad4028
|
[fix] Currency symbol fixed in Accounts receivable/payable report #4020
|
2015-09-17 14:40:15 +05:30 |
|
Anand Doshi
|
1194c6ef4b
|
[fix] use the new split_emails method to split emails by comma
|
2015-09-17 14:40:15 +05:30 |
|
Nabin Hait
|
87c2d1d634
|
[fix] Dashboard info in accounting currency for Customer and Supplier #4017
|
2015-09-17 14:16:01 +05:30 |
|
Anand Doshi
|
2a04d98c16
|
Merge pull request #4023 from saurabh6790/error_report
[Fixes] Check Warehouse for Company Delete and Variant Attribute Value
|
2015-09-17 13:20:05 +05:30 |
|
Anand Doshi
|
12106725fb
|
[fix] set Payment Amount in Payment Tool
|
2015-09-17 12:59:44 +05:30 |
|
Saurabh
|
5fe0086d9a
|
[Fixes] Warehouse check while company delete & Variant Attribute value check
|
2015-09-16 16:59:24 +05:30 |
|
Anand Doshi
|
0b031cdd6c
|
[fix] ignore journal entry based invoice in payment tool and payment reconciliation tool
|
2015-09-16 12:46:54 +05:30 |
|
Anand Doshi
|
c19afa140d
|
[fix] reload time log in update projects patch
|
2015-09-16 12:44:22 +05:30 |
|
Saurabh
|
0bd145a608
|
[fixes] test cases and tax rule validation
|
2015-09-15 17:06:52 +05:30 |
|
Saurabh
|
c663f5c2bd
|
[Test] test state based taxasion
|
2015-09-15 15:41:01 +05:30 |
|
Saurabh
|
adde1cff48
|
[Enhancement] add state ccriteria in tax rule
|
2015-09-15 15:41:01 +05:30 |
|
Saurabh
|
bb9427d1ef
|
[Fixes] deprecated
|
2015-09-15 15:41:01 +05:30 |
|