Commit Graph

262 Commits

Author SHA1 Message Date
Nabin Hait
3bfeefafcd Modified patch 2011-12-16 16:19:38 +05:30
Nabin Hait
f8bfcdc495 Modified patch 2011-12-16 16:15:31 +05:30
Nabin Hait
c57c5b0b44 Return if old patch.py executed anyway 2011-12-16 10:17:26 +05:30
Nabin Hait
b2150de64b Freezing Error fixed in purchase invoice 2011-12-15 16:29:04 +05:30
Nabin Hait
9a0d05d354 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-15 15:48:51 +05:30
Nabin Hait
6e9a1284d4 remove depricated default fileds 2011-12-15 15:48:18 +05:30
Anand Doshi
490d298fa0 patch to remove old control panel email settings 2011-12-15 15:46:31 +05:30
Anand Doshi
ca39b180f5 patch to remove old control panel email settings 2011-12-15 15:40:15 +05:30
Anand Doshi
48d8d36b79 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-15 14:28:02 +05:30
Anand Doshi
7f18dd3b94 Patches for email digest and remove page break from defaults 2011-12-15 14:24:55 +05:30
Nabin Hait
b3081fafb6 Merge pull request #160 from nijil/master
Accounts Default Form Fix
2011-12-14 22:28:52 -08:00
Anand Doshi
a51aefbced Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 20:36:11 +05:30
Anand Doshi
21c649527a Provides better error message to the user 2011-12-14 20:35:19 +05:30
Anand Doshi
407ebb9e41 Merge pull request #161 from anandpdoshi/master
Resolved bug: when account of type 'Bank or Cash' does not exists
2011-12-14 06:36:32 -08:00
Anand Doshi
e7982f0f85 Merge branch 'master' of github.com:anandpdoshi/erpnext
Conflicts:
	erpnext/setup/doctype/email_digest/email_digest.py
2011-12-14 20:05:16 +05:30
Anand Doshi
ddf4c2655d Resolved bug: if account of type 'Bank or Cash' does not exists, then it shows error in the email digest email but does not raise exception 2011-12-14 20:04:04 +05:30
Anand Doshi
3fe9795020 Resolved bug: if account of type 'Bank or Cash' does not exists, then it shows error in the email digest email but does not raise exception 2011-12-14 20:00:55 +05:30
Nabin Hait
44bba97dc9 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 18:09:39 +05:30
Nabin Hait
b93ea233ff Error fixed in task 2011-12-14 18:09:13 +05:30
Anand Doshi
c2a9cca4fd Change in add user dialog box:
Now it includes First Name, Last Name and Password field
if run as a standalone app
2011-12-14 17:12:12 +05:30
Anand Doshi
ad42e558df Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 16:10:44 +05:30
Anand Doshi
ed73fb2b26 Fixed bug regarding setting of banner 2011-12-14 16:09:59 +05:30
Nijil Y
b40f826c5a . 2011-12-14 15:50:09 +05:30
Nijil Y
d18153e413 Account Default settings form fix 2011-12-14 15:28:51 +05:30
Anand Doshi
e47be26682 Merge pull request #159 from anandpdoshi/master
Commented print statement in email_digest.py
2011-12-13 23:07:30 -08:00
Anand Doshi
8875d91a8e Commented print statement while inserting record in scheduler 2011-12-14 12:35:07 +05:30
Nabin Hait
9e4d5b9649 Merge branch 'master' of github.com:webnotes/erpnext 2011-12-14 11:27:50 +05:30
Nabin Hait
3a2fcba15f Purchase Discount option in Features Setup 2011-12-14 11:26:46 +05:30
Nabin Hait
f21ceb283c Arranged field order in item table 2011-12-14 11:26:05 +05:30
Nabin Hait
dcac0e7565 Merge pull request #156 from anandpdoshi/master
Email Digest and patch to remove duplicate entries created in Table Mapper Detail
2011-12-13 05:37:41 -08:00
Nabin Hait
536e0cb1c4 fixes in patch 2011-12-13 19:05:13 +05:30
Nabin Hait
08d803791d Merge branch 'master' of git://github.com/nijil/erpnext 2011-12-13 18:49:59 +05:30
Nabin Hait
85e8e01fd6 notification email for recurring invoice 2011-12-13 18:48:24 +05:30
Nijil Y
f6a3441d99 patch 2011-12-13 18:31:42 +05:30
Nijil Y
8fb260504a purchase discount 2011-12-13 18:14:15 +05:30
Anand Doshi
f5ff4434df Patch to reload Task doctype of Projects Module 2011-12-13 18:13:23 +05:30
Anand Doshi
206df20f36 Changes in print formats to include selected print heading and discount
appended in description
2011-12-13 15:57:09 +05:30
Anand Doshi
130ae98675 Changes in dashboard start date and end date default logic such that the
conditions for fiscal year range are met
2011-12-12 20:24:06 +05:30
Anand Doshi
3a23a5740e In Dashboard, display a customer friendly error message when the start and end dates
are not within a fiscal year
2011-12-12 19:50:09 +05:30
Anand Doshi
5245e6547b Change path of images in accounts browser and sales browser 2011-12-12 19:18:23 +05:30
Nabin Hait
8a6b3b8713 Validation added in c-form 2011-12-12 14:16:16 +05:30
Anand Doshi
deb816d30c Patch to remove duplicate entries created due to change in
validation_logic in Table Mapper Detail for the following doctypes:
* Delivery Note-Receivable Voucher
* Purchase Order-Purchase Voucher
* Sales Order-Receivable Voucher
2011-12-12 12:41:36 +05:30
Nijil Y
fdc7fc62a5 payable voucher.js 2011-12-12 10:50:18 +05:30
Nijil Y
b54d7282a7 pvdetail 2011-12-12 10:31:23 +05:30
Anand Doshi
17c1a7d9ed Merge branch 'master' of github.com:webnotes/erpnext into edigest 2011-12-08 19:36:54 +05:30
Anand Doshi
fb3c3fb064 Merge branch 'master' of github.com:anandpdoshi/erpnext into edigest 2011-12-08 19:36:29 +05:30
Anand Doshi
633edbef46 Email Digest - ready to be deployed 2011-12-08 19:34:01 +05:30
Nijil Y
38821f6104 txt order update 2011-12-08 18:32:58 +05:30
Nabin Hait
7e44f9789b Patch for c-form 2011-12-08 18:07:20 +05:30
Nabin Hait
2577e2ae27 Patch for c-form 2011-12-08 18:06:53 +05:30