Commit Graph

9746 Commits

Author SHA1 Message Date
Nabin Hait
fcbd4d7638 Removed sales_order_no from no_copy in material request item 2013-12-18 14:53:36 +05:30
Pratik Vyas
9409efe02a Merge branch 'develop' 2013-12-18 14:40:36 +05:30
Pratik Vyas
b645a217fd bumped to version 3.3.2 2013-12-18 15:10:36 +06:00
Pratik Vyas
ef295d2977 Merge pull request #1203 from anandpdoshi/hotfix-scheduler-errors
[fix] scheduler error email digest
2013-12-18 01:10:12 -08:00
Akhilesh Darjee
2d0e31b479 [fix] [minor] merge conflict fixed 2013-12-18 13:32:37 +05:30
Akhilesh Darjee
2678ed181a [fix] [issue] webnotes/erpnext#1191 - set expected delivery date in production order 2013-12-18 13:28:40 +05:30
Anand Doshi
1fce0b1f79 [fix] scheduler error email digest 2013-12-18 13:22:18 +05:30
Pratik Vyas
649660d9f0 Merge branch 'develop' 2013-12-18 12:19:28 +05:30
Pratik Vyas
797e0713ea bumped to version 3.3.1 2013-12-18 12:49:28 +06:00
Nabin Hait
6a0ffabbd0 Merge pull request #1201 from nabinhait/hotfix
Hotfix
2013-12-17 21:48:18 -08:00
Nabin Hait
56f58cfa68 Merge pull request #1202 from anandpdoshi/hotfix-backup-manager
[fix] backup manager
2013-12-17 21:48:03 -08:00
Anand Doshi
677ef0c3cf [fix] backup manager 2013-12-18 10:56:43 +05:30
Nabin Hait
64367a905a Merge branch 'develop' of github.com:webnotes/erpnext into hotfix 2013-12-18 10:42:04 +05:30
Nabin Hait
c565de2c12 Removed schedule_date from no_copy in purchase receipt item 2013-12-18 10:41:29 +05:30
Nabin Hait
908f2dc0fd Merge pull request #1200 from anandpdoshi/hotfix-scheduler-errors
[patch] Email Digest
2013-12-17 20:13:56 -08:00
Anand Doshi
0b1a8e13fd [patch] Email Digest 2013-12-18 07:53:49 +05:30
Pratik Vyas
a1ae0270e3 Merge branch 'develop' 2013-12-17 18:03:05 +05:30
Pratik Vyas
4d806c5fcb bumped to version 3.3.0 2013-12-17 18:33:05 +06:00
Anand Doshi
cf6e13d2fe Merge pull request #1148 from nabinhait/reports
Reports
2013-12-17 04:26:36 -08:00
Nabin Hait
ceb940ec17 [reports] [minor] patch to delete old report files 2013-12-17 17:53:05 +05:30
Nabin Hait
a4080eb840 [fix] [minor] item validation 2013-12-17 17:45:50 +05:30
Nabin Hait
90f33c3249 Merge pull request #1196 from nabinhait/hotfix
[fix] [minor] precision in gl entry based on currency format
2013-12-17 03:20:02 -08:00
Nabin Hait
592d27e7f1 [reports] general ledger: grid report to script report 2013-12-17 16:20:11 +05:30
Nabin Hait
8b7da55617 Merge branch 'develop' of github.com:webnotes/erpnext into reports 2013-12-17 16:10:06 +05:30
Nabin Hait
57e89ff6f1 [reports] general ledger: grid report to script report 2013-12-17 16:09:21 +05:30
Nabin Hait
8a98fc7e79 Merge pull request #1194 from akhileshdarjee/master
[feature] create material request sales order wise from production planning tool
2013-12-17 01:39:19 -08:00
Akhilesh Darjee
d94bab0e1d [fix] [minor] sql query related changes in purchase common 2013-12-17 15:05:37 +05:30
Nabin Hait
9d6e10c910 [fix] [minor] precision in gl entry based on currency format 2013-12-17 14:45:55 +05:30
Akhilesh Darjee
9ee20e8f5a [fix] [minor] material request sales order wise through production planning tool 2013-12-17 13:07:00 +05:30
Pratik Vyas
3ddd0d89df Merge pull request #1181 from anandpdoshi/hotfix-allow-roles
[minor] [fix] allow roles
2013-12-16 22:19:34 -08:00
Pratik Vyas
60ec93811e Merge pull request #1190 from anandpdoshi/hotfix-scheduler-errors
[minor] [scheduler] send scheduler errors as email digest
2013-12-16 22:18:43 -08:00
Akhilesh Darjee
dbb69dacff Merge branch 'master' of github.com:webnotes/erpnext 2013-12-16 19:33:20 +05:30
Akhilesh Darjee
9ff9dafd00 [feature] create material request sales order wise from production planning tool 2013-12-16 19:32:22 +05:30
Rushabh Mehta
91e9822f65 fixed test cases webnotes/wnframework#351 2013-12-16 18:43:42 +05:30
Nabin Hait
ea4f66791e Merge branch 'develop' of github.com:webnotes/erpnext into reports 2013-12-16 15:18:34 +05:30
Anand Doshi
b0636edaf7 [minor] [scheduler] send scheduler errors as email digest 2013-12-16 13:56:03 +05:30
Rushabh Mehta
c652a6254f Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351 2013-12-16 12:48:38 +05:30
Nabin Hait
c55b55d959 Merge pull request #1186 from nabinhait/hotfix
[fix] [minor] email digest: consider only submitted documents to get new...
2013-12-14 22:55:17 -08:00
Nabin Hait
585e936263 [fix] [minor] email digest: consider only submitted documents to get new sum of amount 2013-12-15 12:17:40 +05:30
Pratik Vyas
42c7c5b547 Merge branch 'develop' 2013-12-14 17:59:58 +05:30
Pratik Vyas
ba31ecc611 bumped to version 3.2.3 2013-12-14 18:29:58 +06:00
Nabin Hait
2d46d3cd04 Merge pull request #1184 from nabinhait/hotfix
[fix] [minor] match condition fixes for customer and supplier
2013-12-14 04:06:46 -08:00
Nabin Hait
1d361cf26c [minor] merge conflict 2013-12-14 17:36:22 +05:30
Nabin Hait
45a35ced33 [fix] [minor] match condition fixes for customer and supplier 2013-12-14 17:29:42 +05:30
Nabin Hait
fe5dcd49ae Merge pull request #1183 from nabinhait/hotfix
[fix] [minor] update naming series
2013-12-14 03:50:02 -08:00
Nabin Hait
70cd146bb5 [fix] [minor] update naming series 2013-12-14 17:16:21 +05:30
Pratik Vyas
99e641e4c7 Merge branch 'develop' 2013-12-14 00:45:37 +05:30
Pratik Vyas
dea59996d8 bumped to version 3.2.2 2013-12-14 01:15:37 +06:00
Rushabh Mehta
30430796c7 notifications via hooks webnotes/wnframework#351 2013-12-13 15:33:40 +05:30
Rushabh Mehta
6de403f2be added manifest, hooks and fixed requires webnotes/wnframework#351 2013-12-13 14:10:14 +05:30