Anand Doshi
|
9f25575e0c
|
Merge pull request #3988 from nabinhait/fix2
Set expense account in stock reco only if company available
|
2015-09-08 15:59:18 +05:30 |
|
Anand Doshi
|
e1af7f1a0f
|
[minor] default mins_between_operations = 10
|
2015-09-08 15:55:09 +05:30 |
|
Anand Doshi
|
c35df5ce80
|
Merge branch 'rmehta-stock-settings' into develop
Conflicts:
erpnext/patches.txt
|
2015-09-08 15:54:17 +05:30 |
|
Anand Doshi
|
2c2868db11
|
[translations]
|
2015-09-08 15:53:54 +05:30 |
|
Anand Doshi
|
17f28c13ed
|
[fix] Customer match condition in autosuggest
|
2015-09-08 15:53:54 +05:30 |
|
Anand Doshi
|
3f1f2dd307
|
[fix] setup wizard - industry type
|
2015-09-08 15:53:53 +05:30 |
|
Anand Doshi
|
ab05dcd9f9
|
[fix] [patch] reload item attribute + value
|
2015-09-08 15:53:53 +05:30 |
|
Rushabh Mehta
|
f21edba97f
|
[fixes] to task test case and fix tree ui for mobile
|
2015-09-08 15:53:53 +05:30 |
|
Rushabh Mehta
|
91b0e2348c
|
[minor] task not mandatory for Time Log and Expense Claim #3904
|
2015-09-08 15:53:53 +05:30 |
|
Nabin Hait
|
4de91887db
|
[patch] Re-run the 'default_title' patch
|
2015-09-08 15:53:35 +05:30 |
|
Anand Doshi
|
9b1288605f
|
bumped to version 6.0.1
|
2015-09-08 15:53:05 +05:30 |
|
Anand Doshi
|
43888546f6
|
Merge pull request #3968 from rmehta/task-not-mandatory
[minor] task not mandatory for Time Log and Expense Claim #3904
|
2015-09-08 15:47:11 +05:30 |
|
Anand Doshi
|
68d2e317d2
|
Merge pull request #3992 from anandpdoshi/translations
[translations]
|
2015-09-08 15:45:08 +05:30 |
|
Nabin Hait
|
2249eea59f
|
Fixed conflict
|
2015-09-08 12:55:21 +05:30 |
|
Nabin Hait
|
d608363d7b
|
[fix] Map amount in advance payment entry agaionst SO/PO based on party account currency
|
2015-09-08 12:53:59 +05:30 |
|
Nabin Hait
|
b2739cbb79
|
Get average exchange rate in case of bank transfer
|
2015-09-08 12:18:45 +05:30 |
|
Anand Doshi
|
f5940907ae
|
[translations]
|
2015-09-07 18:47:04 +05:30 |
|
Anand Doshi
|
90162078d5
|
Merge pull request #3989 from anandpdoshi/customer-query-match-condition
Customer match condition in autosuggest
|
2015-09-07 14:52:49 +05:30 |
|
Anand Doshi
|
cba99743a4
|
[fix] Customer match condition in autosuggest
|
2015-09-07 14:51:30 +05:30 |
|
Nabin Hait
|
f44128f81c
|
Set expense account in stock reco only if company available
|
2015-09-07 10:45:15 +05:30 |
|
Nabin Hait
|
3607737b5e
|
Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency
|
2015-09-07 10:41:01 +05:30 |
|
Nabin Hait
|
bf9691ed39
|
Multiple fixes
|
2015-09-07 10:40:48 +05:30 |
|
Anand Doshi
|
bbca95fd1b
|
[fix] setup wizard - industry type
|
2015-09-07 10:11:46 +05:30 |
|
Anand Doshi
|
4df98d52c1
|
[fix] setup wizard - industry type
|
2015-09-07 10:11:23 +05:30 |
|
Nabin Hait
|
e9b445c853
|
[fix] Stock Entry additional costs patch fix for v4 accounts
|
2015-09-05 11:17:11 +05:30 |
|
Anand Doshi
|
28f8664b93
|
[fix] [patch] reload item attribute + value
|
2015-09-04 16:41:27 +05:30 |
|
Nabin Hait
|
216aaaf1d6
|
Set currency and exchange rate based on Customer's currency while making Quotation from Opportunity
|
2015-09-04 16:41:04 +05:30 |
|
Rushabh Mehta
|
be9edae961
|
[fixes] to task test case and fix tree ui for mobile
|
2015-09-04 16:18:17 +05:30 |
|
Rushabh Mehta
|
4223d7c044
|
[minor] task not mandatory for Time Log and Expense Claim #3904
|
2015-09-04 16:18:17 +05:30 |
|
Nabin Hait
|
3a53d49b7e
|
[fix] Set account and party balance in Journal Entry
|
2015-09-04 15:46:47 +05:30 |
|
Nabin Hait
|
4d62d7867e
|
[report] Bank Reconciliation Statement in account currency
|
2015-09-04 13:26:45 +05:30 |
|
Nabin Hait
|
c0e3b1a0c7
|
Removed account and party balance in company currency from Journal Entry
|
2015-09-04 13:26:23 +05:30 |
|
Nabin Hait
|
34fe81f7eb
|
Patch fixed
|
2015-09-03 19:18:00 +05:30 |
|
Nabin Hait
|
11a746d363
|
Fixed conflict
|
2015-09-03 16:04:11 +05:30 |
|
Nabin Hait
|
1609933748
|
Test cases for multi currency
|
2015-09-03 16:03:07 +05:30 |
|
Anand Doshi
|
5f90f7096d
|
Merge pull request #3976 from nabinhait/fixes1
[patch] Re-run the 'default_title' patch
|
2015-09-03 11:15:53 +05:30 |
|
Nabin Hait
|
59c4ae5a46
|
[patch] Re-run the 'default_title' patch
|
2015-09-03 10:46:48 +05:30 |
|
Rushabh Mehta
|
85abdc4fad
|
[minor] added stock settings for serial no. #3967. Merge with https://github.com/frappe/frappe/pull/1291
|
2015-09-03 10:29:38 +05:30 |
|
Nabin Hait
|
98096771c2
|
[multi currency] Introduced Accounting Currency in Customer and Supplier, and validation according to that
|
2015-09-03 10:28:08 +05:30 |
|
Anand Doshi
|
ba51ebd1b7
|
Merge branch 'develop'
|
2015-09-02 18:58:14 +05:30 |
|
Anand Doshi
|
be090fa512
|
bumped to version 6.0.1
|
2015-09-02 19:28:14 +06:00 |
|
Rushabh Mehta
|
c2283ca304
|
[hot] [fix] remove test options in Opportunity
|
2015-09-02 18:56:35 +05:30 |
|
Rushabh Mehta
|
deb38f7a68
|
[enhancement] document management system
|
2015-09-02 18:34:24 +05:30 |
|
Anand Doshi
|
283850ce47
|
Merge pull request #3971 from anandpdoshi/fix-item-variant-attributes
Attributes in the variant should be in the same order as in the Template
|
2015-09-02 16:09:09 +05:30 |
|
Anand Doshi
|
caa839003b
|
Merge branch 'develop'
|
2015-09-02 16:02:45 +05:30 |
|
Anand Doshi
|
a6130dc918
|
bumped to version 6.0.0
|
2015-09-02 16:32:45 +06:00 |
|
Anand Doshi
|
099bbbded0
|
Attributes in the variant should be in the same order as in the Template
- Moved Item Variant code from item.py to controllers/item_variant.py
- Use Template Item's order of Attribute for Variant Item
|
2015-09-02 15:56:55 +05:30 |
|
Anand Doshi
|
c3796d273c
|
[change-log]
|
2015-09-02 15:54:53 +05:30 |
|
Anand Doshi
|
28700d6404
|
Merge pull request #3973 from nabinhait/fix14
[Fix] Delete Company Transactions
|
2015-09-02 14:59:44 +05:30 |
|
Anand Doshi
|
38f400ea87
|
Merge pull request #3972 from nabinhait/fix
Item Price Fix
|
2015-09-02 14:57:26 +05:30 |
|