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 |
|
Anand Doshi
|
793b87948c
|
[fix] [patch] item template attributes
|
2015-09-10 18:10:15 +05:30 |
|
Anand Doshi
|
a1b0ff09a8
|
Merge pull request #4004 from nabinhait/fix9
[fix] Bypass Root Not Editable validation from Setup Wizard
|
2015-09-10 15:56:45 +05:30 |
|
Nabin Hait
|
5a803d76ad
|
[fix] Bypass Root Not Editable validation from Setup Wizard
|
2015-09-10 13:20:35 +05:30 |
|
Nabin Hait
|
9513025130
|
[fix] Igonre permissions while saving Company and Warehouse from Accounts Settings
|
2015-09-10 12:13:27 +05:30 |
|
Rushabh Mehta
|
a13c60bf9f
|
[minor] fix title in readme
|
2015-09-10 10:43:43 +05:30 |
|
Rushabh Mehta
|
bc23e5ac5c
|
[minor] rename notified_modifed > notified_update. Merge with #1296
|
2015-09-10 10:30:41 +05:30 |
|
Nabin Hait
|
2377cdfa4e
|
Fixed conflict
|
2015-09-09 18:45:41 +05:30 |
|
Nabin Hait
|
e3ae05aabd
|
Multi-currency: Exchange Rate in Journal Entry
|
2015-09-09 18:43:12 +05:30 |
|
Anand Doshi
|
a2fda1c779
|
Merge branch 'develop'
|
2015-09-09 18:42:49 +05:30 |
|
Anand Doshi
|
a29577ca71
|
bumped to version 6.1.1
|
2015-09-09 19:12:48 +06:00 |
|
Anand Doshi
|
b1454cdf9f
|
[fix] fix planned qty
|
2015-09-09 18:00:09 +05:30 |
|
Anand Doshi
|
f668a4d03c
|
Merge branch 'develop'
|
2015-09-09 15:32:03 +05:30 |
|
Anand Doshi
|
c2b4ae6667
|
bumped to version 6.1.0
|
2015-09-09 16:02:03 +06:00 |
|
Anand Doshi
|
1857bb8b0b
|
[change-log]
|
2015-09-09 15:23:16 +05:30 |
|
Anand Doshi
|
888a70c2d4
|
[fix] Setup Wizard - the case of forgetting mute emails
|
2015-09-09 15:14:54 +05:30 |
|
Anand Doshi
|
9d5b84e78a
|
Merge pull request #3996 from nabinhait/fix6
Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order
|
2015-09-09 15:11:12 +05:30 |
|
Anand Doshi
|
bdc125ad0f
|
Merge pull request #3999 from nabinhait/planned_qty
Planned Qty logic fixed and reposted for existing
|
2015-09-09 13:14:09 +05:30 |
|
Nabin Hait
|
f0b3014a23
|
Planned Qty logic fixed and reposted for existing
|
2015-09-09 11:04:10 +05:30 |
|
Nabin Hait
|
0b17a91aba
|
Merge pull request #3998 from nabinhait/fix7
[fix] Gross Profit report should not include return entries
|
2015-09-09 10:37:30 +05:30 |
|
Nabin Hait
|
83dd3e14e5
|
[fix] Gross Profit report should not include return entries
|
2015-09-09 10:37:04 +05:30 |
|
Anand Doshi
|
38f64ea3ab
|
Merge pull request #3991 from anandpdoshi/apply-user-permissions-fix
[minor] Unset Apply User Permissions in default permissions
|
2015-09-08 22:09:44 +05:30 |
|
Nabin Hait
|
cd103c05d6
|
Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order
|
2015-09-08 19:24:35 +05:30 |
|
Anand Doshi
|
bc1e8b4408
|
[minor] Unset Apply User Permissions in default permissions
|
2015-09-08 19:23:23 +05:30 |
|