| commit | dbb84a271ec134092939ba16f5e996ac19c7e976 | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@iwebnotes.com> | Tue Jun 05 18:37:17 2012 +0530 |
| committer | Anand Doshi <anand@iwebnotes.com> | Tue Jun 05 18:37:17 2012 +0530 |
| tree | 117553b8bce22047248e09cd5922ae7948ec2dd7 | |
| parent | 390b788e7b8e33c50414dcc1f1b53e42bd14e821 [diff] | |
| parent | 252a7a189bf18661af4ea90c19b8a5a837d663ea [diff] |
Merge branch 'master' of github.com:webnotes/erpnext into comm_log Conflicts: erpnext/selling/doctype/lead/lead.js erpnext/setup/doctype/contact_control/contact_control.js
Includes Accounting, Inventory, CRM, Sales, Purchase, Projects, HRMS. Built on Python / MySQL.
ERPNext is built on wnframework (Version 2.0)
GNU/General Public License