Commit Graph

5727 Commits

Author SHA1 Message Date
Rushabh Mehta
c8580930eb Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-03-19 11:12:44 +05:30
Rushabh Mehta
a54cb247c4 webshop login, logout 2013-03-19 11:12:22 +05:30
Anand Doshi
a111bb104b Merge branch 'master' of github.com:webnotes/erpnext 2013-03-18 18:20:50 +05:30
Anand Doshi
839fee3e71 restrict material_request_type in Material Request form 2013-03-18 18:20:09 +05:30
Anand Doshi
5afe037a5b deprecate sales and purchase return tool 2013-03-18 17:59:56 +05:30
Anand Doshi
080f9098c0 deprecated sales and purchase return tool 2013-03-18 17:57:59 +05:30
Anand Doshi
f11e2f8f6f Merge branch 'master' of github.com:webnotes/erpnext into sales_purchase_return
Conflicts:
	patches/patch_list.py
2013-03-18 17:42:08 +05:30
Anand Doshi
ab7b7c2974 completed sales purchase return as part of stock entry 2013-03-18 17:37:31 +05:30
root
5e8c91d79e Merge branch 'master' of https://github.com/webnotes/erpnext
Conflicts:
	setup/doctype/backup_manager/backup_dropbox.py
	setup/doctype/backup_manager/backup_manager.py
2013-03-18 15:08:37 +05:30
Rushabh Mehta
8f43b31dae Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-03-18 12:53:22 +05:30
Rushabh Mehta
759ea0c022 Merge branch 'master' into edge 2013-03-18 12:53:06 +05:30
Rushabh Mehta
edf639b607 fixed backup/gdrive 2013-03-18 12:48:34 +05:30
Rushabh Mehta
f64407d363 Merge branch 'master' of github.com:akhileshdarjee/erpnext 2013-03-18 11:26:09 +05:30
Akhilesh Darjee
daae56926b Merge branch 'master' of https://github.com/webnotes/erpnext 2013-03-18 11:17:06 +05:30
Anand Doshi
cfbd192782 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-18 11:16:00 +05:30
Akhilesh Darjee
b0f0e7a82f added backup_googledrive.py in backup_manager 2013-03-18 11:15:44 +05:30
Anand Doshi
6f1dd26100 on deletion of lead, delete communication reference 2013-03-18 11:15:31 +05:30
Anand Doshi
34e13add4c on deletion of lead, delete communication 2013-03-18 11:14:25 +05:30
Rushabh Mehta
9feffd5591 Merge branch 'master' of github.com:akhileshdarjee/erpnext 2013-03-18 10:57:37 +05:30
Rushabh Mehta
5265f79e03 [website] product_page.html - fixed width 2013-03-18 10:31:18 +05:30
Anand Doshi
36a3461e55 fix in payment reconciliation patch - run for all modified dates >= 2013-03-11 2013-03-16 19:09:26 +05:30
Anand Doshi
6230aa9292 make return jv for sales return 2013-03-16 19:05:11 +05:30
Anand Doshi
f33bef5a69 Merge branch 'master' into edge 2013-03-15 17:51:45 +05:30
Anand Doshi
0db9407712 fix in payment reconciliation patch 2013-03-15 17:50:21 +05:30
Anand Doshi
1524c2a5b6 create return jv 2013-03-15 17:42:45 +05:30
Akhilesh Darjee
d3a30d84df Merge branch 'master' of https://github.com/webnotes/erpnext 2013-03-15 16:23:59 +05:30
Akhilesh Darjee
479af526b0 Backup commited. 2013-03-15 16:17:31 +05:30
Anand Doshi
9f3f3e6ee6 Merge branch 'master' into edge 2013-03-15 13:49:30 +05:30
Anand Doshi
1cf7391562 patch to fix incorrect gl entries due to payment reconciliation between 2013-03-11 and 2013-03-15 2013-03-15 13:42:31 +05:30
Anand Doshi
be67b7a77f Merge branch 'master' into edge 2013-03-15 11:55:46 +05:30
Rushabh Mehta
c08e1037d6 blog_feed 2013-03-15 11:36:43 +05:30
Anand Doshi
87052b366b validate over-return of stock for sales purchase return 2013-03-15 11:32:40 +05:30
Rushabh Mehta
d5d9d5032a Merge branch 'master' into edge 2013-03-15 11:31:47 +05:30
Rushabh Mehta
37db223329 make blog as raw content 2013-03-15 11:29:25 +05:30
Rushabh Mehta
cb6cf710bb website module: product page update 2013-03-14 16:45:28 +05:30
Rushabh Mehta
e9bef3cbf0 website module: minor updates 2013-03-14 15:39:43 +05:30
Rushabh Mehta
1ffaaf4110 website module: minor updates 2013-03-14 15:36:43 +05:30
Rushabh Mehta
93da8a1b0e website module: minor updates 2013-03-14 15:32:49 +05:30
Rushabh Mehta
1aab4eaf8d website module: minor updates 2013-03-14 15:06:44 +05:30
Rushabh Mehta
ebee1c7033 website module: minor updates 2013-03-14 14:33:31 +05:30
Anand Doshi
0a1ac4090c Merge branch 'master' into sales_purchase_return 2013-03-14 12:07:39 +05:30
Rushabh Mehta
4836e11d95 Merge branch 'master' into edge 2013-03-14 11:15:17 +05:30
root
1988ff9cdb Merge remote-tracking branch 'upstream/master' 2013-03-14 10:29:59 +05:30
Rushabh Mehta
7bec21cfe7 feature setup: fix for more info 2013-03-14 10:09:13 +05:30
Rushabh Mehta
b8bf40f789 feature setup: fix for more info 2013-03-14 10:07:59 +05:30
Rushabh Mehta
2e2993444a removed style settings save patch 2013-03-13 22:18:20 +05:30
Rushabh Mehta
e99ae3e475 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-03-13 16:39:26 +05:30
Rushabh Mehta
5128b664a7 website: added no_cache to message page 2013-03-13 16:36:33 +05:30
Rushabh Mehta
a1041d5128 website: don't waste db connection if loading page from cache 2013-03-13 16:34:43 +05:30
Rushabh Mehta
d84f299c40 website_settings: added button to generate html banner 2013-03-13 16:30:10 +05:30