This website requires JavaScript.
3ddd0d89df
Merge pull request #1181 from anandpdoshi/hotfix-allow-roles
Pratik Vyas
2013-12-16 22:19:34 -08:00
60ec93811e
Merge pull request #1190 from anandpdoshi/hotfix-scheduler-errors
Pratik Vyas
2013-12-16 22:18:43 -08:00
dbb69dacff
Merge branch 'master' of github.com:webnotes/erpnext
Akhilesh Darjee
2013-12-16 19:33:20 +05:30
9ff9dafd00
[feature] create material request sales order wise from production planning tool
Akhilesh Darjee
2013-12-16 19:32:22 +05:30
91e9822f65
fixed test cases webnotes/wnframework#351
Rushabh Mehta
2013-12-16 18:43:42 +05:30
ea4f66791e
Merge branch 'develop' of github.com:webnotes/erpnext into reports
Nabin Hait
2013-12-16 15:18:34 +05:30
b0636edaf7
[minor] [scheduler] send scheduler errors as email digest
Anand Doshi
2013-12-16 13:51:09 +05:30
c652a6254f
Rewrote hooks for scheduler, notifications, boot, session, login, webpage webnotes/wnframework#351
Rushabh Mehta
2013-12-16 12:48:22 +05:30
c55b55d959
Merge pull request #1186 from nabinhait/hotfix
Nabin Hait
2013-12-14 22:55:17 -08:00
585e936263
[fix] [minor] email digest: consider only submitted documents to get new sum of amount
Nabin Hait
2013-12-15 12:17:40 +05:30
42c7c5b547
Merge branch 'develop'
Pratik Vyas
2013-12-14 17:59:58 +05:30
ba31ecc611
bumped to version 3.2.3
Pratik Vyas
2013-12-14 18:29:58 +06:00
2d46d3cd04
Merge pull request #1184 from nabinhait/hotfix
Nabin Hait
2013-12-14 04:06:46 -08:00
1d361cf26c
[minor] merge conflict
Nabin Hait
2013-12-14 17:36:22 +05:30
45a35ced33
[fix] [minor] match condition fixes for customer and supplier
Nabin Hait
2013-12-14 17:29:42 +05:30
fe5dcd49ae
Merge pull request #1183 from nabinhait/hotfix
Nabin Hait
2013-12-14 03:50:02 -08:00
70cd146bb5
[fix] [minor] update naming series
Nabin Hait
2013-12-14 17:16:21 +05:30
99e641e4c7
Merge branch 'develop'
Pratik Vyas
2013-12-14 00:45:37 +05:30
dea59996d8
bumped to version 3.2.2
Pratik Vyas
2013-12-14 01:15:37 +06:00
30430796c7
notifications via hooks webnotes/wnframework#351
Rushabh Mehta
2013-12-13 15:33:40 +05:30
6de403f2be
added manifest, hooks and fixed requires webnotes/wnframework#351
Rushabh Mehta
2013-12-13 14:10:14 +05:30
64c512dd61
[minor] [fix] allow roles
Anand Doshi
2013-12-13 12:34:52 +05:30
5534b59d07
Merge pull request #1180 from nabinhait/hotfix
Nabin Hait
2013-12-12 22:11:22 -08:00
1251a93fc5
[fix] [minor] fixes in packed item
Nabin Hait
2013-12-13 11:40:16 +05:30
52e5b84584
Merge branch 'develop'
Pratik Vyas
2013-12-12 19:15:30 +05:30
f943dc5dc1
bumped to version 3.2.1
Pratik Vyas
2013-12-12 19:45:30 +06:00
1f84799f2d
install, web serving, session booting webnotes/wnframework#351
Rushabh Mehta
2013-12-12 19:12:19 +05:30
e0bc9a713e
Merge pull request #1179 from nabinhait/hotfix
Nabin Hait
2013-12-12 04:16:52 -08:00
f6e06311be
[cleanup] [minor] carry forwarded leaves field read only and depends on carry forward checkbox
Nabin Hait
2013-12-12 17:45:29 +05:30
050be0248a
Merge pull request #1178 from nabinhait/hotfix
Nabin Hait
2013-12-12 03:43:59 -08:00
c10c0c5066
[fix] [minor] series skipping issue in salary manager
Nabin Hait
2013-12-12 17:13:22 +05:30
bdb83b1b5a
Merge pull request #1177 from nabinhait/hotfix1
Nabin Hait
2013-12-12 01:33:42 -08:00
c3f2fb7355
[fix] [minor] payment to invoice patching tool
Nabin Hait
2013-12-12 14:55:25 +05:30
d2dd83c3a3
fixed template loader webnotes/wnframework#351
Rushabh Mehta
2013-12-12 13:57:58 +05:30
a6db546457
Merge branch 'develop'
Pratik Vyas
2013-12-12 13:09:21 +05:30
6ad8973538
bumped to version 3.2.0
Pratik Vyas
2013-12-12 13:39:21 +06:00
2e66a842bb
Merge pull request #1170 from akhileshdarjee/master
Nabin Hait
2013-12-11 23:29:18 -08:00
ca02db5006
Merge pull request #1175 from nabinhait/hotfix
Nabin Hait
2013-12-11 23:22:28 -08:00
13fc64d732
[fix] [minor] Negative outstanding validation for JV against JV
Nabin Hait
2013-12-12 12:50:42 +05:30
7d4c2d62bf
[fix] [minor] allowed renaming for address and contact
Akhilesh Darjee
2013-12-12 12:32:43 +05:30
ffa938a3fb
Merge pull request #1174 from nabinhait/hotfix
Nabin Hait
2013-12-11 22:28:50 -08:00
9d835a039a
[fix] [minor] convert serial no to upper case for comparing
Nabin Hait
2013-12-12 11:00:40 +05:30
1b23208779
[minor] get bundle working, almost
Pratik Vyas
2013-12-12 10:44:38 +05:30
229b246d6d
[fix] [minor] production planning tool clear sales order table
Akhilesh Darjee
2013-12-11 18:49:11 +05:30
39bb8e2ed4
step 0: install
Rushabh Mehta
2013-12-11 15:32:14 +05:30
e460aa277b
added setup.py
Rushabh Mehta
2013-12-11 11:32:21 +05:30
42a8fc2ee3
[fix] [minor] stashed sales_invoice.txt
Akhilesh Darjee
2013-12-11 11:15:03 +05:30
b234a3545a
moved config.json inside erpnext
Rushabh Mehta
2013-12-11 10:55:55 +05:30
afea58b7a1
moved modules inside erpnext folder
Rushabh Mehta
2013-12-11 10:43:52 +05:30
f0dad52aaa
[fix] [minor] merge conflict fix
Akhilesh Darjee
2013-12-10 18:11:31 +05:30
aebb9f422b
[fix] [minor] merge conflict fixes
Akhilesh Darjee
2013-12-10 18:01:18 +05:30
4e677a3f52
[fix] [minor] stashed bom.txt
Akhilesh Darjee
2013-12-10 15:23:07 +05:30
abefa3fd40
[fix] [minor] supplier & customer rename fix
Akhilesh Darjee
2013-12-10 14:22:52 +05:30
5d3da6c095
[fix] [minor] rename fix for customer and supplier
Akhilesh Darjee
2013-12-10 11:18:08 +05:30
ba82163d53
Merge develop for release
Pratik Vyas
2013-12-09 17:16:05 +05:30
e4bb2ba158
bumped to version 3.1.2
Pratik Vyas
2013-12-09 17:41:11 +06:00
c9df05126a
Merge pull request #1167 from akhileshdarjee/master
Anand Doshi
2013-12-09 03:03:39 -08:00
5ce1b8b8f9
[fix] [minor] customer name visibility fixed in sales invoice
Akhilesh Darjee
2013-12-09 16:29:04 +05:30
7b1d9409f1
[fix] [minor] remove email patch
Akhilesh Darjee
2013-12-09 15:57:26 +05:30
a652347bd1
[fix] [minor] customer_name not visible in sales invoice
Akhilesh Darjee
2013-12-09 15:52:47 +05:30
dc68b2e7ab
Merge pull request #1154 from anandpdoshi/hotfix
Anand Doshi
2013-12-09 00:43:25 -08:00
46b18475a3
Merge pull request #1157 from pdvyas/slow-migration-patch-fix
Anand Doshi
2013-12-08 22:39:29 -08:00
32e7b30744
bumped to version 3.1.1
Pratik Vyas
2013-12-08 17:17:05 +06:00
d9255abd46
[fix] [minor] set send_print_in_body_and_attachment in email settings
Akhilesh Darjee
2013-12-06 18:49:48 +05:30
4a8930fc67
[report]general ledger report migrated to script report
Nabin Hait
2013-12-06 18:07:23 +05:30
c313ca99ff
[report]general ledger report migrated to script report
Nabin Hait
2013-12-06 16:36:23 +05:30
18098c9c78
Merge pull request #1160 from webnotes/develop
Nabin Hait
2013-12-06 01:26:49 -08:00
1417c6d58f
[hotfix] fix null issue in budget variance
Pratik Vyas
2013-12-06 14:50:06 +05:30
86da17d5d9
[minor] removed mandatory validation in server side
Nabin Hait
2013-12-06 13:23:31 +05:30
ce2dfadfbd
Merge branch 'develop' of github.com:webnotes/erpnext into reports
Nabin Hait
2013-12-06 12:10:37 +05:30
d701e83961
[minor] make slow branch migratable to master
Pratik Vyas
2013-12-05 18:05:07 +05:30
afc44cf54e
[fix] [minor] email settings - set send print in body and attachment
Akhilesh Darjee
2013-12-05 17:42:53 +05:30
c3d8b06623
bumped to version 3.1.0
Pratik Vyas
2013-12-05 16:56:37 +06:00
dcd928ca61
Merge develop for release
Pratik Vyas
2013-12-05 16:21:35 +05:30
fc1b4f858c
Merge pull request #1155 from nabinhait/report1
Nabin Hait
2013-12-05 02:48:19 -08:00
c8c13b90ce
[report] stock ledger loading time
Nabin Hait
2013-12-05 16:08:30 +05:30
e587c689a3
[minor] added simplified and traditional chinese in languages list
Anand Doshi
2013-12-05 13:02:06 +05:30
9fd2d79fc7
Merge pull request #1149 from anandpdoshi/hotfix
Nabin Hait
2013-12-04 21:08:06 -08:00
01d2811ccd
[report] migrated stock level report to script report and renamed to Stock Projected Qty
Nabin Hait
2013-12-04 19:16:50 +05:30
690c75fa0d
[report] migrated stock level report to script report and renamed to Stock Projected Qty
Nabin Hait
2013-12-04 19:16:32 +05:30
462401c4df
[minor] fixed conflict
Nabin Hait
2013-12-04 17:26:22 +05:30
1b5de63163
Merge branch 'hotfix' into reports
Nabin Hait
2013-12-04 17:23:45 +05:30
9b0a6d426c
[patch] [minor] deleted old stock ledger and stock ageing page
Nabin Hait
2013-12-04 17:18:05 +05:30
ca8f87903c
Merge pull request #1147 from nabinhait/hotfix1
Nabin Hait
2013-12-04 03:35:52 -08:00
281a2d2bd1
[fix] [minor] fetch items from bom while repacking
Nabin Hait
2013-12-04 17:04:39 +05:30
cca731901b
Merge pull request #1118 from rmehta/chinese
Anand Doshi
2013-12-04 03:15:54 -08:00
bc6df5c71b
[patch] [minor] deleted old stock ledger and stock ageing page
Nabin Hait
2013-12-04 16:42:23 +05:30
df019807a9
In Website Contact form, if Support is selected from first dropdown, a Support Ticket should be created instead of a Lead Communication
Anand Doshi
2013-12-04 16:27:30 +05:30
80d9514636
Merge pull request #1141 from nabinhait/hotfix
Nabin Hait
2013-12-04 01:50:13 -08:00
c2da052c80
[fix] [minor] make bank voucher from salary manager
Nabin Hait
2013-12-04 15:17:46 +05:30
40580d5d01
[fix] [minor] Master name validation for customer/supplier/warehouse account
Nabin Hait
2013-12-02 16:20:18 +05:30
32803f8635
Merge pull request #1144 from akhileshdarjee/master
Nabin Hait
2013-12-03 22:33:10 -08:00
245200f129
[fix] [minor] bom operations fix
Akhilesh Darjee
2013-12-04 11:54:13 +05:30
28b33dfdd7
[patch] startup.js styling
Rushabh Mehta
2013-12-04 11:16:38 +05:30
c94891cc8e
Merge pull request #1139 from akhileshdarjee/master
Nabin Hait
2013-12-03 21:25:32 -08:00
72f689b1f9
[fix] [minor] setup print fix in sales invoice
Akhilesh Darjee
2013-12-04 10:46:55 +05:30
47e40242bd
[minor] removed old stock ageing grid report
Nabin Hait
2013-12-02 23:13:36 +05:30
7eb90d3d5c
Stock Ageing report migated to Script report
Nabin Hait
2013-12-02 20:12:18 +05:30
7e37b00d0a
[fix] [minor] merge conflict fixed
Akhilesh Darjee
2013-12-02 18:02:45 +05:30
9c0569ee2d
[report] payment collection with ageing and payment made with ageing merged to payment period based on invoice date
Akhilesh Darjee
2013-12-02 17:58:23 +05:30