Commit Graph

1939 Commits

Author SHA1 Message Date
Nabin Hait
9ff92369ad lead organization fld added in quotation for printing 2012-03-20 16:44:15 +05:30
Anand Doshi
12b6da2614 sync with gateway now in defs - no need for utility in wnf 2012-03-20 14:55:16 +05:30
Anand Doshi
8347aad402 email settings separated from control panel 2012-03-20 14:54:25 +05:30
Rushabh Mehta
9b1afe197d cleanup of form, rename, route, added fonts 2012-03-20 14:37:44 +05:30
Nabin Hait
93654a3e04 stock entry: new purpose others added 2012-03-20 14:31:14 +05:30
Nabin Hait
594ee37d26 patch list updated 2012-03-20 14:26:32 +05:30
Nabin Hait
547478f973 stock entry: new purpose others added in stock entry 2012-03-20 14:26:14 +05:30
Anand Doshi
d05aad6474 fix in POS invoice 2012-03-20 12:33:02 +05:30
Anand Doshi
6ba51ca693 POS Invoice fix 2012-03-20 12:24:51 +05:30
Anand Doshi
4f5e92a06c Merge branch 'master' of github.com:webnotes/erpnext 2012-03-20 12:17:50 +05:30
Anand Doshi
547ce9f9c8 POS Invoice fix 2012-03-20 12:11:38 +05:30
Anand Doshi
3401086d66 POS Invoice fix 2012-03-20 12:07:18 +05:30
Nabin Hait
bdd6877a4f Merge branch 'master' of github.com:webnotes/erpnext 2012-03-19 18:56:08 +05:30
Nabin Hait
31e0eacb7a Update erpnext/selling/doctype/sales_order/sales_order.js 2012-03-19 18:54:11 +05:30
Rushabh Mehta
9d0fc767b2 merge 2012-03-19 18:44:33 +05:30
Nabin Hait
11824ffb90 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-19 18:43:51 +05:30
Nabin Hait
fdab486720 Update erpnext/selling/doctype/sales_order/sales_order.js 2012-03-19 18:43:07 +05:30
Rushabh Mehta
d48417c93b slide navigation fixes 2012-03-19 18:42:13 +05:30
Nabin Hait
7107d4af2b Merge branch 'master' of github.com:webnotes/erpnext 2012-03-19 18:39:42 +05:30
Rushabh Mehta
8d8fa66e8f Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-19 14:06:12 +01:00
Nabin Hait
b7dce7da31 Update erpnext/stock/doctype/delivery_note/delivery_note.js 2012-03-19 18:35:57 +05:30
Rushabh Mehta
ffe9d358e8 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-19 12:40:07 +01:00
Nabin Hait
65ad3b1a0f Update erpnext/accounts/search_criteria/trial_balance/trial_balance.py 2012-03-19 17:09:14 +05:30
Nabin Hait
a189af48f6 Merge branch 'master' of github.com:webnotes/erpnext 2012-03-19 16:27:42 +05:30
Nabin Hait
16d9f4942a Update erpnext/setup/doctype/manage_account/manage_account.txt 2012-03-19 15:48:08 +05:30
Nabin Hait
422f7e99db Update erpnext/selling/doctype/customer/customer.txt 2012-03-19 15:37:03 +05:30
Nabin Hait
9aa3777ba6 Update erpnext/setup/doctype/sales_person/sales_person.txt 2012-03-19 15:21:30 +05:30
Nabin Hait
e5d99f5ed1 Update erpnext/setup/doctype/manage_account/manage_account.txt 2012-03-19 15:15:20 +05:30
Anand Doshi
a7158f6ea9 fix in session expiry 2012-03-19 14:41:05 +05:30
Anand Doshi
5dabfdd920 sync doctype - first cut 2012-03-19 14:26:14 +05:30
Rushabh Mehta
6498cee998 fixed conflict 2012-03-19 09:01:16 +01:00
Nabin Hait
b6cd3316c4 error fixed in lease receipts client wise 2012-03-19 13:27:06 +05:30
Anand Doshi
f02c9e7b6c fix in due_date fetching for receivable voucher 2012-03-19 11:43:24 +05:30
Rushabh Mehta
a0a53c90f1 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-19 06:12:43 +01:00
Nabin Hait
15a0271557 Update erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt 2012-03-19 10:22:32 +05:30
Nabin Hait
9f5b2cd8d9 Update erpnext/stock/doctype/delivery_note/delivery_note.txt 2012-03-19 10:20:22 +05:30
Rushabh Mehta
7afaa8665d major reworking of page navigation 2012-03-16 18:28:09 +05:30
Nabin Hait
deac31fd2d Update erpnext/selling/doctype/sales_common/sales_common.py 2012-03-16 15:14:27 +05:30
Nabin Hait
15afe87984 cost center will be fetched from other charges master 2012-03-16 15:11:02 +05:30
Rushabh Mehta
8e3d596cbc Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-15 16:44:19 +05:30
Rushabh Mehta
2438de4c9b fixed tags in list2 2012-03-15 16:43:46 +05:30
Rushabh Mehta
2f052fd1ff Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-15 07:22:39 +01:00
Rushabh Mehta
5b9e0951d7 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
	version.num
2012-03-15 07:21:43 +01:00
Anand Doshi
92da889d32 fix in report builder saving 2012-03-15 11:50:26 +05:30
Anand Doshi
d2a40c2594 sync with gateway moved to defs 2012-03-15 11:13:50 +05:30
Anand Doshi
96188f0310 sync with gateway moved to defs 2012-03-15 11:11:57 +05:30
Rushabh Mehta
f47192c5ce merge 2012-03-14 19:07:11 +05:30
Rushabh Mehta
08b670bddd listing with stats 2012-03-14 19:06:20 +05:30
Rushabh Mehta
3b3e336fcc Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-14 13:25:19 +01:00
Anand Doshi
018f075b66 Merge branch 'master' into sync 2012-03-14 17:54:32 +05:30