Nabin Hait
|
87c2d1d634
|
[fix] Dashboard info in accounting currency for Customer and Supplier #4017
|
2015-09-17 14:16:01 +05:30 |
|
Anand Doshi
|
d4aa27cbb8
|
Merge pull request #4025 from anandpdoshi/split-emails
use the new split_emails method to split emails by comma. Merge this after Communication CC is merged.
|
2015-09-17 14:00:03 +05:30 |
|
Nabin Hait
|
59f4fa9a8c
|
[fix] Account Currency and Balance fixed in chart of accounts #4019
|
2015-09-17 13:57:42 +05:30 |
|
Anand Doshi
|
3b0c0a76b4
|
Merge pull request #4028 from nabinhait/mc1
[fix] Currency symbol fixed in Accounts receivable/payable report #4020
|
2015-09-17 13:38:32 +05:30 |
|
Nabin Hait
|
262ac09305
|
[fix] Currency symbol fixed in Accounts receivable/payable report #4020
|
2015-09-17 13:24:14 +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
|
fec9f75707
|
Merge pull request #4021 from anandpdoshi/payment-tool-ignore-journal-entry
ignore journal entry based invoice in payment tool and payment reconciliation tool
|
2015-09-17 13:19:06 +05:30 |
|
Anand Doshi
|
12106725fb
|
[fix] set Payment Amount in Payment Tool
|
2015-09-17 12:59:44 +05:30 |
|
Anand Doshi
|
c5f919eb68
|
[fix] use the new split_emails method to split emails by comma
|
2015-09-16 19:20:55 +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 |
|
Saurabh
|
052babc6b6
|
[Fixes] [Minor] removed console statement
|
2015-09-15 15:41:01 +05:30 |
|
Saurabh
|
24fa06bc53
|
[Fixes] rebase conflict fixes
|
2015-09-15 15:41:01 +05:30 |
|
Saurabh
|
7c867ae9ad
|
[Fixes] Tax Rule preparation and test taxes creation, remove dummy quotation
|
2015-09-15 15:41:01 +05:30 |
|
Saurabh
|
8f7317175d
|
[enhancement] bring taxes from tax rules and test cases
|
2015-09-15 15:41:01 +05:30 |
|
Saurabh
|
957e7a37be
|
[Shopping Cart][Fixes] tax calculation based on tax rule
|
2015-09-15 15:41:01 +05:30 |
|
Saurabh
|
def71d4d5d
|
[Shopping Cart][Fixes] tax calculation based on tax rule
|
2015-09-15 15:41:00 +05:30 |
|
Neil Trini Lasrado
|
ef511b160e
|
Added Tax Rule under ERPNext > Accounts > Setup
|
2015-09-15 15:41:00 +05:30 |
|
Neil Trini Lasrado
|
09f9c96c53
|
Fixes in Tax Rule
|
2015-09-15 15:41:00 +05:30 |
|
Neil Trini Lasrado
|
1a2d121073
|
Removed default taxes and charges from customer and supplier master. Added patch to create tax rules against customer/supplier
|
2015-09-15 15:41:00 +05:30 |
|
Neil Trini Lasrado
|
810bd35609
|
Apply Tax Rule based on Customer Selection in Sales / Purchase Transactions
|
2015-09-15 15:41:00 +05:30 |
|
Neil Trini Lasrado
|
949d7dbaba
|
Added validations, test-cases to Tax Rule
|
2015-09-15 15:41:00 +05:30 |
|
Neil Trini Lasrado
|
72e6aa160c
|
Added New Doctype Tax Rule
|
2015-09-15 15:41:00 +05:30 |
|
Anand Doshi
|
0870b185de
|
Merge pull request #4015 from anandpdoshi/use-add-fetch
Use add_fetch in Product Bundle, Maintenance Visit and Maintenance Schedule instead of redundant get_item_details method
|
2015-09-15 14:02:06 +05:30 |
|
Anand Doshi
|
69f2cc8d24
|
[fix] don't fetch template item in get items of stock reconciliation
|
2015-09-15 11:54:13 +05:30 |
|
Anand Doshi
|
86102064a5
|
[fix] Use add_fetch in Product Bundle, Maintenance Visit and Maintenance Schedule instead of redundant get_item_details method
|
2015-09-15 11:50:30 +05:30 |
|
Anand Doshi
|
0fd3347148
|
[fix] handle invalid date in get_retirement_date
|
2015-09-15 11:29:51 +05:30 |
|
Anand Doshi
|
b74265c842
|
[minor] [patch] reload activity cost in default_activity_rate
|
2015-09-15 11:27:19 +05:30 |
|
Anand Doshi
|
1fef2fad2d
|
[minor] fixes in queries and payment tool
|
2015-09-14 18:27:21 +05:30 |
|
Anand Doshi
|
9345240ff1
|
Merge pull request #4007 from anandpdoshi/setup-wizard-duplicate-entry
catch DuplicateEntryError in install_fixtures step of Setup Wizard
|
2015-09-14 16:33:16 +05:30 |
|
Anand Doshi
|
9ab23231e6
|
Merge pull request #4011 from anandpdoshi/defaults-during-creation
[fix] Use User Permission value as default only if the document type is Setup. Merge with frappe/frappe#1304
|
2015-09-14 16:33:00 +05:30 |
|
Anand Doshi
|
dbe623b167
|
[fix] Use User Permission value as default only if the document type is Setup
|
2015-09-14 13:08:53 +05:30 |
|
Anand Doshi
|
71e51c179c
|
[fix] changed modified for multi-currency sync
|
2015-09-11 16:55:11 +05:30 |
|
Anand Doshi
|
4b8dbbdf98
|
[minor] Change modified of Sales Invoice.json
|
2015-09-11 16:39:03 +05:30 |
|
Anand Doshi
|
aaf1895a12
|
Merge branch 'nabinhait-multi-currency' into develop
Conflicts:
erpnext/accounts/doctype/journal_entry/journal_entry.json
|
2015-09-11 16:35:17 +05:30 |
|
Anand Doshi
|
979326b0b1
|
minor fixes in multi-currency
|
2015-09-11 16:33:45 +05:30 |
|
Anand Doshi
|
5d9cfc76cd
|
Don't copy title field in Duplicate
|
2015-09-11 15:35:26 +05:30 |
|
Nabin Hait
|
8db7bd2d8f
|
[fix] Igonre permissions while saving Company and Warehouse from Accounts Settings
|
2015-09-11 15:34:42 +05:30 |
|
Rushabh Mehta
|
d461d462aa
|
[minor] rename notified_modifed > notified_update. Merge with #1296
|
2015-09-11 15:34:41 +05:30 |
|
Anand Doshi
|
e67fa424b2
|
[fix] catch DuplicateEntryError in install_fixtures step of Setup Wizard
|
2015-09-11 15:32:06 +05:30 |
|
Anand Doshi
|
121176f0e9
|
Merge pull request #4002 from rmehta/notify-update-rename
[minor] rename notified_modifed > notified_update. Merge with #1296
|
2015-09-11 15:11:57 +05:30 |
|
Anand Doshi
|
1c2636e7b3
|
Merge pull request #4003 from nabinhait/fix8
[fix] Igonre permissions while saving Company and Warehouse from Accounts Settings
|
2015-09-11 15:00:13 +05:30 |
|
Anand Doshi
|
840cad0ff7
|
Don't copy title field in Duplicate
|
2015-09-11 12:26:57 +05:30 |
|
Nabin Hait
|
f76d63b92a
|
Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency
[fix][patch] delete item variant attributes if no variants exists against that item
|
2015-09-10 19:26:02 +05:30 |
|
Nabin Hait
|
71ef6675ce
|
[fix] Journal Entry client side minor fixes
|
2015-09-10 19:25:50 +05:30 |
|