Commit Graph

543 Commits

Author SHA1 Message Date
Nabin Hait
29f3ecd6b1 [patch] create chart of accounts if not created 2013-04-09 14:46:12 +05:30
Nabin Hait
807e4788d5 fixes in patches 2013-04-09 14:31:14 +05:30
Nabin Hait
8022a439a8 role added in some pages 2013-04-09 11:49:42 +05:30
Nabin Hait
832320dc15 fixed conflict 2013-04-09 11:43:03 +05:30
Nabin Hait
fda2ab1054 fixed conflict 2013-04-09 11:41:20 +05:30
Nabin Hait
d35293de17 updated all role in some pages 2013-04-09 11:39:16 +05:30
Nabin Hait
fdea83ef42 fixed conflict 2013-04-08 13:08:19 +05:30
Nabin Hait
2b61f6142a fixed conflict 2013-04-08 12:44:57 +05:30
Anand Doshi
30bd65a81b [patches] [fix] reload docperm 2013-04-07 10:19:18 +05:30
Rushabh Mehta
d8cf1d74ba Merge branch 'master' into edge 2013-04-03 16:39:02 +05:30
Rushabh Mehta
cc86ec8642 merge 2013-04-03 16:38:20 +05:30
Nabin Hait
5c1d3c5a8b [New Script Report] added report daily time log summary 2013-04-03 15:44:19 +05:30
Rushabh Mehta
27c4079ff9 [framework] [cleanup] desktop, todo, messages, modules setup moved to framework 2013-04-03 15:21:44 +05:30
Rushabh Mehta
e726448268 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-04-03 10:42:37 +05:30
Rushabh Mehta
5bbe063222 Merge branch 'master' into edge 2013-04-03 10:42:12 +05:30
Rushabh Mehta
c5ddb85d39 [patch] [fix] added reload print format 2013-04-03 10:06:54 +05:30
Rushabh Mehta
c0ad4a2229 [patch] [fix] added reload print format 2013-04-03 09:58:04 +05:30
Nabin Hait
596ff91b3a [quotation][improvement] when made from lead 2013-04-02 18:24:06 +05:30
Nabin Hait
1e3fc88940 [quotation][improvement] when made from lead 2013-04-02 18:13:20 +05:30
Anand Doshi
234b8e3de3 Merge branch 'master' into edge
Conflicts:
	patches/march_2013/p07_update_valuation_rate.py
	patches/patch_list.py
2013-04-02 16:06:43 +05:30
Nabin Hait
996e469562 added country Aruba and currency AWG 2013-04-02 14:26:26 +05:30
Rushabh Mehta
5c12765313 [merge] 2013-04-02 10:51:11 +05:30
Nabin Hait
2a8b2c1356 [patch][serial no] for striped serial nos 2013-04-01 17:49:15 +05:30
Nabin Hait
2f20a7ac96 [patch][serial no] for striped serial nos 2013-04-01 17:23:43 +05:30
Anand Doshi
19acce9fa1 [aii] [patches] minor fixes 2013-03-29 20:40:23 +05:30
Nabin Hait
787c02ee42 aii fixes 2013-03-29 16:42:33 +05:30
Nabin Hait
acecb94a0f patch: update item tax rate in json format 2013-03-29 10:48:41 +05:30
Rushabh Mehta
acfab66239 [patch] [fix] substr starts with 1 2013-03-28 16:47:47 +05:30
Rushabh Mehta
2fe802c81e [website] [cleanup] selectable images will now be relative urls (files/..) or full urls (http:..) 2013-03-28 16:26:11 +05:30
Nabin Hait
41fe3567bb fixed conflict and aii check in global defaults 2013-03-28 15:54:11 +05:30
Nabin Hait
e2fe8de637 patch: update against expense_account in purchase invoice 2013-03-28 15:30:41 +05:30
Anand Doshi
c1fd51b04a Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	patches/patch_list.py
2013-03-27 17:36:43 +05:30
Anand Doshi
e35073157c set fiscal year in stock entry and stock reconciliation 2013-03-27 17:35:23 +05:30
Rushabh Mehta
114dc67571 [patch] [fix] 2013-03-26 17:20:31 +01:00
Rushabh Mehta
80fee65ed2 [patch] [fix] material rename 2013-03-26 21:34:38 +05:30
Anand Doshi
40dc9e83a5 fixes in test cases and added fiscal year field to stock reco 2013-03-26 14:49:25 +05:30
Anand Doshi
9f91053201 patch to set user type as System User if user has a role and if previous user type is Partner 2013-03-26 12:25:11 +05:30
Nabin Hait
82be7dc301 fixed conflict 2013-03-25 18:30:15 +05:30
Nabin Hait
557d858d89 aii: patches and default values fetching 2013-03-25 18:28:16 +05:30
Rushabh Mehta
74506e96d3 [profile/email] [feature] added option not to send print as email body. fix in profile delete 2013-03-25 17:52:14 +05:30
Rushabh Mehta
06d186ba98 [stock] [feature] added project to stock ledger entry and updated stock balance report 2013-03-25 17:03:52 +05:30
Nabin Hait
456465770b aii: patch: update valuation rate in purchase invoice item 2013-03-25 11:07:12 +05:30
Anand Doshi
e31d64ffe1 save global defaults 2013-03-19 18:42:29 +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
36a3461e55 fix in payment reconciliation patch - run for all modified dates >= 2013-03-11 2013-03-16 19:09:26 +05:30
Anand Doshi
0db9407712 fix in payment reconciliation patch 2013-03-15 17:50:21 +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
0a1ac4090c Merge branch 'master' into sales_purchase_return 2013-03-14 12:07:39 +05:30
Rushabh Mehta
2e2993444a removed style settings save patch 2013-03-13 22:18:20 +05:30