Commit Graph

144 Commits

Author SHA1 Message Date
Nabin Hait
e3ce5b4e0c voucher date removal issue fixed 2012-03-01 17:37:36 +05:30
Nabin Hait
be0b090d27 voucher date removal issue fixed 2012-03-01 17:31:51 +05:30
Anand Doshi
496d9a0980 Merge branch 'master' into navupdate 2012-03-01 14:55:22 +05:30
Nabin Hait
b95ad21208 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-03-01 14:48:13 +05:30
Nabin Hait
cf907f98bd error fixed in posting balance 2012-03-01 14:47:56 +05:30
Anand Doshi
552093c3fd Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
	version.num
2012-03-01 13:51:23 +05:30
Anand Doshi
1f4efc77ac fix in print formats and file rename 2012-03-01 13:50:33 +05:30
Nabin Hait
eaf144a545 form cleanup in pur cycle 2012-03-01 13:05:04 +05:30
Nabin Hait
6d517ff005 form cleanup: fixed callback issues 2012-03-01 10:57:23 +05:30
Nabin Hait
63b275c97f allowed debit and credit against same acc head 2012-03-01 10:35:35 +05:30
Nabin Hait
6c75cce4b9 fixed confilct 2012-02-28 11:46:43 +05:30
Anand Doshi
f9e4b16731 fix in scheduler related import issue 2012-02-28 11:31:46 +05:30
Nabin Hait
5bdd20c46b dynamic label change, form cleanup, hide/unhide in purchase cycle 2012-02-27 18:46:51 +05:30
Nabin Hait
0959341130 Form Cleanup: Dynamic label change, smart hide/unhide and dependencies 2012-02-27 12:47:40 +05:30
Nabin Hait
0cde984dc5 Update future year balances at the time of tranaction and acc bal reposting patch 2012-02-27 12:34:14 +05:30
Rushabh Mehta
3966f1dc5d added license files 2012-02-23 12:35:32 +05:30
Rushabh Mehta
c5471ddb8d added setup and removed multi-col layout in body 2012-02-22 12:07:42 +05:30
Rushabh Mehta
35fabf76a6 updated module pages 2012-02-21 19:03:50 +05:30
Rushabh Mehta
d025133b39 added module pages and other css updates 2012-02-21 17:26:50 +05:30
Nabin Hait
6ac0be5fb2 delete all cancelled gl entry on account deletion 2012-02-20 13:04:36 +05:30
Nabin Hait
2d8ac7f3f9 fixed asynchronus issue 2012-02-15 17:31:23 +05:30
Nabin Hait
ab90ee04f5 callback issues and item default get most priority 2012-02-15 14:28:02 +05:30
Nabin Hait
84d73103f8 sales team mapping issue in SO-DN and SO-RV 2012-02-14 15:13:21 +05:30
Anand Doshi
ce0c65f173 Merge branch 'stable' into latest 2012-02-13 18:01:23 +05:30
Rushabh Mehta
f17ce7bc67 added whitelist check 2012-02-13 16:50:52 +05:30
Anand Doshi
702f174265 call update item details in post render 2012-02-13 15:29:41 +05:30
Anand Doshi
15d2d45b36 Merge branch 'stable' into latest 2012-02-10 10:57:26 +05:30
Anand Doshi
110047ea5b Debit/Credit note creation on purchase/sales return 2012-02-10 10:48:35 +05:30
Anand Doshi
cf5f0232a9 Merge branch 'stable' into latest 2012-02-08 16:23:35 +05:30
Anand Doshi
df3f452a14 Fix in Purchase Invoice creation due to item tax stringify issue 2012-02-08 16:22:59 +05:30
Anand Doshi
9908d6e4be Merge branch 'stable' into latest 2012-02-08 11:05:47 +05:30
Anand Doshi
c9fcc05792 Allow IS POS to be set as default from customize form view 2012-02-08 10:46:27 +05:30
Anand Doshi
4e47c48707 Merge branch 'stable' into latest 2012-02-07 13:33:10 +05:30
Anand Doshi
7e8082e193 Fixed mapping of conversion rate for PO-PR and PO-PV 2012-02-07 13:32:20 +05:30
Anand Doshi
67d2c8396c Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
	version.num
2012-02-07 10:59:29 +05:30
Anand Doshi
e00e70841c Merge branch 'stable' into latest
Conflicts:
	erpnext/accounts/doctype/journal_voucher/journal_voucher.js
	erpnext/accounts/doctype/payable_voucher/payable_voucher.js
	index.html
	version.num
2012-02-07 10:58:45 +05:30
Anand Doshi
d008964fd6 Fetch defaults in purchase common and sales common related doctypes and fix minor utf-8 issues 2012-02-07 10:48:11 +05:30
Rushabh Mehta
e651648b1b added missing icons 2012-02-06 16:28:06 +05:30
Anand Doshi
6d5cd01e03 Merge branch 'stable' into latest 2012-02-02 15:36:58 +05:30
Anand Doshi
2cb047d5a4 Added search field 'account_type' in account doctype 2012-02-02 15:36:34 +05:30
Anand Doshi
62427a6024 Merge branch 'stable' into latest 2012-02-02 15:23:33 +05:30
Anand Doshi
962c2aa80d Auto fetch default bank account for jv of type Bank Voucher 2012-02-02 15:22:11 +05:30
Rushabh Mehta
bc5ec4f19e version 2012-01-30 14:02:41 +05:30
Rushabh Mehta
d6840b202a added products + cleanups 2012-01-30 14:00:46 +05:30
Anand Doshi
e72de12993 Merge branch 'master' into latest
Conflicts:
	index.html
	version.num
2012-01-30 11:59:05 +05:30
Anand Doshi
76a4caeada fix in send notification part of recurring invoices 2012-01-27 14:34:26 +05:30
Anand Doshi
f5738817db fix in recurring invoice 2012-01-27 14:18:09 +05:30
Anand Doshi
707cd06606 Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
	erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py
2012-01-27 12:30:35 +05:30
Anand Doshi
02c662936f Merge branch 'master' into latest 2012-01-27 12:28:21 +05:30
Anand Doshi
74d1b65105 changed sql to webnotes.conn.sql to avoid errors due to closing of connections in scheduler/push patch 2012-01-27 12:25:09 +05:30