Commit Graph

11294 Commits

Author SHA1 Message Date
Rushabh Mehta
f579cf9871 [opportunity] status open 2015-04-13 16:58:47 +05:30
Rushabh Mehta
4ac3094049 [opportunity] status open 2015-04-13 16:56:03 +05:30
Rushabh Mehta
c712dc6729 [opportunity] status open 2015-04-13 16:51:27 +05:30
Rushabh Mehta
99a4d63d97 [opportunity] status open 2015-04-13 16:24:35 +05:30
Rushabh Mehta
fd0f1cb8b7 [opportunity] not submittable 2015-04-13 16:21:58 +05:30
Rushabh Mehta
20bcf6aeff [fixes] print_hide on stock uom and gross profit 2015-04-13 15:31:24 +05:30
Rushabh Mehta
39c84fe31c [hot] coa 2015-04-13 12:16:25 +05:30
Rushabh Mehta
b4c4351513 [report] fix via error report 2015-04-13 11:30:10 +05:30
Pratik Vyas
2437d4cce2 Fix #3046 Customer Acquisition and Loyalty repor 2015-04-10 12:35:43 +05:30
Pratik Vyas
950bf72471 Merge pull request #3087 from pdvyas/lang
update translations
2015-04-10 10:29:54 +05:30
Pratik Vyas
7f8cc32d38 update translations 2015-04-10 10:26:08 +05:30
Anand Doshi
a0630671da [hotfix] batch query 2015-04-09 13:34:57 +05:30
Pratik Vyas
9490d9dee3 Merge branch 'v4.x.x' 2015-04-09 13:16:47 +05:30
Pratik Vyas
c95e4e89d5 bumped to version 4.24.4 2015-04-09 12:56:05 +06:00
Nabin Hait
b362bb076d Merge pull request #3083 from nabinhait/v4.x.x
company in reports
2015-04-09 11:50:19 +05:30
Nabin Hait
031b1251cf Merge branch 'anandpdoshi-anand-mar-30' into v4.x.x 2015-04-09 11:42:47 +05:30
Nabin Hait
4642d0697e fixed conflict 2015-04-09 11:42:24 +05:30
Nabin Hait
4f0231e34b Merge pull request #3075 from nabinhait/v4.x.x
V4.x.x
2015-04-09 11:22:20 +05:30
Anand Doshi
00a07de426 fixed test earning type 2015-04-08 21:49:11 +05:30
Anand Doshi
c994647704 fixed test cases 2015-04-08 21:22:36 +05:30
Anand Doshi
2f87fb41fa Merge pull request #3069 from neilLasrado/dob
validation added - dob cannot accept a future date
2015-04-08 13:25:01 +05:30
Prasad Ajinkya
2a29e53cb2 Update README.md
WordPress is always with a capital "P". If you want people to respect your brand, you need to start respecting other brands' guidelines as well :)
2015-04-08 13:24:25 +05:30
Anand Doshi
a1a3468704 Merge pull request #3068 from neilLasrado/leaves
Bug Fixes
2015-04-08 13:20:18 +05:30
Anand Doshi
519f0f8b0c Merge pull request #2966 from neilLasrado/HR
Offer Letter
2015-04-08 13:06:36 +05:30
Neil Trini Lasrado
4b29ccc2b0 Salary Structure - Earnings made mandatory 2015-04-08 12:29:40 +05:30
Neil Trini Lasrado
4ba4d9dbef fix - update button didnt work in leave allocation after submit 2015-04-08 12:29:40 +05:30
Neil Trini Lasrado
20f0ef2515 validation added - dob cannot accept a future date 2015-04-08 12:29:01 +05:30
Neil Trini Lasrado
28b0cc4d0b fixes in offer letter 2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
496e277d8a print format added 2015-04-08 12:28:21 +05:30
Rushabh Mehta
aca5cb6513 [fixes] offer letter 2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
8ca547b7f2 terms view added 2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
e1d620b168 Offer Letter - New Doctype added and job_applicant naming changed 2015-04-08 12:28:20 +05:30
Nabin Hait
0277ae298a pending amount to be delivered in report 2015-04-07 17:49:53 +05:30
Pratik Vyas
d102cba71c [patch] [fix] Fix missing image column error 2015-04-07 15:32:15 +05:30
Anand Doshi
e4e112a6bc setup wizard - don't send welcome mail 2015-04-07 11:03:58 +05:30
Nabin Hait
6eb55d4d3d allowed import for delivery note 2015-04-07 09:42:44 +05:30
Anand Doshi
03cf407574 [fix] removed print 2015-04-06 19:38:13 +05:30
Anand Doshi
c399709789 fixes to test cases 2015-04-06 19:29:16 +05:30
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