Anand Doshi
|
0dc79f4de0
|
Merge remote-tracking branch 'frappe/v4.x.x' into develop
Conflicts:
.travis.yml
erpnext/__version__.py
erpnext/controllers/queries.py
erpnext/hooks.py
erpnext/selling/sales_common.js
erpnext/stock/doctype/bin/bin.py
erpnext/stock/doctype/stock_entry/stock_entry.js
erpnext/stock/doctype/stock_entry/stock_entry.py
erpnext/stock/stock_ledger.py
setup.py
|
2015-04-06 13:21:07 +05:30 |
|
Anand Doshi
|
731b15edf4
|
[hotfix] taxes and totals
|
2015-04-05 20:09:09 +05:30 |
|
Anand Doshi
|
22af7deadd
|
minor fixes
|
2015-04-05 17:18:07 +05:30 |
|
Anand Doshi
|
7854779c22
|
[hotfix] strip email when importing newsletter list
|
2015-04-05 13:44:52 +05:30 |
|
Anand Doshi
|
e4580447d0
|
[fix] on setup wizard language selection and load, set it as system default language
|
2015-04-04 16:15:04 +05:30 |
|
Anand Doshi
|
85e5d46370
|
[fix] opportunity email pulling
|
2015-04-03 15:03:01 +05:30 |
|
Anand Doshi
|
c13c4f014e
|
[fix] editable amount in Purchase Taxes and Charges
|
2015-04-03 14:55:51 +05:30 |
|
Anand Doshi
|
432c12ad93
|
[fix] email account patch fix and minor setup wizard fix
|
2015-04-03 14:30:15 +05:30 |
|
Rushabh Mehta
|
8bd54f27c5
|
Merge pull request #3051 from rmehta/opportunity
Opportunity
|
2015-04-03 11:01:59 +05:30 |
|
Rushabh Mehta
|
f63a3d4a80
|
[fiscal year] automatically set year end date if more than one year
|
2015-04-03 10:59:48 +05:30 |
|
Anand Doshi
|
9d3adc3abf
|
Merge pull request #3048 from anandpdoshi/anand-april-2-v5
Party Model Patch
|
2015-04-03 08:22:59 +05:30 |
|
Rushabh Mehta
|
bb2041d22c
|
[patch] fix
|
2015-04-02 22:11:16 +05:30 |
|
Rushabh Mehta
|
7c32770a69
|
move opportunity item to CRM
|
2015-04-02 22:06:36 +05:30 |
|
Rushabh Mehta
|
3c626faf8f
|
[incoming sales email] to opportunity
|
2015-04-02 22:02:33 +05:30 |
|
Rushabh Mehta
|
4c46687fb1
|
[incoming sales email] to opportunity
|
2015-04-02 22:00:34 +05:30 |
|
Rushabh Mehta
|
05e39992d0
|
[setup-wizard] don't catch duplicate
|
2015-04-02 18:55:36 +05:30 |
|
Anand Doshi
|
5445c460b7
|
[fix] [patch] party model patch
|
2015-04-02 17:42:27 +05:30 |
|
Rushabh Mehta
|
750ceedbc1
|
[production order] explict idx + test fix
|
2015-04-02 16:03:11 +05:30 |
|
Rushabh Mehta
|
99a41952a4
|
[lead] [email] fixes
|
2015-04-02 15:53:11 +05:30 |
|
Anand Doshi
|
54448aabd6
|
Setup wizard fixes
|
2015-04-02 15:39:44 +05:30 |
|
Rushabh Mehta
|
ffc190d34d
|
Merge pull request #3013 from neilLasrado/expense
Expense Claim - 'Total Amount Reimbursed' feild added
|
2015-04-02 14:29:29 +05:30 |
|
Anand Doshi
|
83f87da3d1
|
Show Write-Off for all Sales Invoices if there is a Grand Total
|
2015-04-02 13:43:51 +05:30 |
|
Rushabh Mehta
|
d7a5b7309b
|
[minor] fix
|
2015-04-01 23:38:37 +05:30 |
|
Anand Doshi
|
bfa3a08576
|
fixed welcome emails
|
2015-04-01 23:34:16 +05:30 |
|
Anand Doshi
|
3aaab1a39e
|
setup wizard fixes
|
2015-04-01 22:01:54 +05:30 |
|
Rushabh Mehta
|
99d90e1f34
|
[setup] send welcome emails after setup
|
2015-04-01 20:32:57 +05:30 |
|
Anand Doshi
|
7b6daafbb9
|
[minor] left aligned email footer, raise duplicate entry error for common email id in Employee and Sales Person
|
2015-04-01 16:26:59 +05:30 |
|
Anand Doshi
|
8ea1ed143b
|
Show write-off section if pos or advance payment
|
2015-04-01 16:25:55 +05:30 |
|
Rushabh Mehta
|
4c8d01ba9e
|
[issue] close, reopen buttons
|
2015-04-01 15:43:14 +05:30 |
|
Rushabh Mehta
|
918ddf2537
|
[task] open, close from list:
|
2015-04-01 15:43:14 +05:30 |
|
Anand Doshi
|
ee57a8d2a4
|
[hotfix] unique job applicant
|
2015-04-01 12:29:30 +05:30 |
|
Anand Doshi
|
dd77287cb9
|
[fix] fiscal year auto-create
|
2015-04-01 08:26:32 +05:30 |
|
Anand Doshi
|
5745cf7600
|
fixed rename field patches
|
2015-03-31 17:31:53 +05:30 |
|
Anand Doshi
|
92af795f12
|
Fixed note permission query
|
2015-03-31 14:42:22 +05:30 |
|
Rushabh Mehta
|
aefc01372f
|
[listview] issue: open, close | so, po: stop, unstop
|
2015-03-31 13:39:42 +05:30 |
|
Anand Doshi
|
fc79492bac
|
Lead Status in List, minor fix in Make Email Accounts patch
|
2015-03-30 22:35:51 +05:30 |
|
Anand Doshi
|
d6a360b51b
|
[fix] check job application unique email id
|
2015-03-30 21:11:34 +05:30 |
|
Pratik Vyas
|
4ec1a9e8f6
|
Move frappe field renames to frappe
|
2015-03-30 19:37:02 +05:30 |
|
Sambhaji Kolate
|
a4fa96cc79
|
some fix in batch related cleanup
|
2015-03-30 16:04:55 +05:30 |
|
Pratik Vyas
|
10224c9d86
|
bumped to version 4.24.3
|
2015-03-30 13:11:48 +06:00 |
|
Anand Doshi
|
adcf857c37
|
fixed newsletter unsubscribe and default footer
|
2015-03-27 17:42:18 +05:30 |
|
Nabin Hait
|
54c865e77c
|
Landed cost voucher: fixes for serialized item
|
2015-03-27 15:39:06 +05:30 |
|
Nabin Hait
|
f977ad036e
|
reload block module
|
2015-03-27 10:49:41 +05:30 |
|
Nabin Hait
|
e5604dc944
|
production order operation order by idx
|
2015-03-26 17:40:57 +05:30 |
|
Nabin Hait
|
789ef7e346
|
stock balance report fixed
|
2015-03-26 17:40:57 +05:30 |
|
Neil Trini Lasrado
|
a6b3415cdd
|
Expense Claim - 'Total Amount Reimbursed' feild added
|
2015-03-26 14:13:44 +05:30 |
|
Nabin Hait
|
7057970c0c
|
purchase order items to be billed report
|
2015-03-26 11:05:13 +05:30 |
|
Rushabh Mehta
|
eb928b950f
|
[fix] journal entry 3 cols, default weekly digest
|
2015-03-25 17:34:20 +05:30 |
|
Nabin Hait
|
d25fda7537
|
patch fixes
|
2015-03-25 15:55:09 +05:30 |
|
Nabin Hait
|
06b0b36ae6
|
Patch fixes
|
2015-03-25 14:51:35 +05:30 |
|