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 |
|
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
|
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
|
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
|
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
|
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 |
|