Commit Graph

7876 Commits

Author SHA1 Message Date
Nabin Hait
5534b59d07 Merge pull request #1180 from nabinhait/hotfix
[fix] [minor] fixes in packed item
2013-12-12 22:11:22 -08:00
Nabin Hait
1251a93fc5 [fix] [minor] fixes in packed item 2013-12-13 11:40:16 +05:30
Pratik Vyas
52e5b84584 Merge branch 'develop' 2013-12-12 19:15:30 +05:30
Pratik Vyas
f943dc5dc1 bumped to version 3.2.1 2013-12-12 19:45:30 +06:00
Nabin Hait
e0bc9a713e Merge pull request #1179 from nabinhait/hotfix
[cleanup] [minor] carry forwarded leaves field read only and depends on ...
2013-12-12 04:16:52 -08:00
Nabin Hait
f6e06311be [cleanup] [minor] carry forwarded leaves field read only and depends on carry forward checkbox 2013-12-12 17:45:29 +05:30
Nabin Hait
050be0248a Merge pull request #1178 from nabinhait/hotfix
[fix] [minor] series skipping issue in salary manager
2013-12-12 03:43:59 -08:00
Nabin Hait
c10c0c5066 [fix] [minor] series skipping issue in salary manager 2013-12-12 17:13:22 +05:30
Nabin Hait
bdb83b1b5a Merge pull request #1177 from nabinhait/hotfix1
[fix] [minor] payment to invoice patching tool
2013-12-12 01:33:42 -08:00
Nabin Hait
c3f2fb7355 [fix] [minor] payment to invoice patching tool 2013-12-12 15:01:12 +05:30
Pratik Vyas
a6db546457 Merge branch 'develop' 2013-12-12 13:09:21 +05:30
Pratik Vyas
6ad8973538 bumped to version 3.2.0 2013-12-12 13:39:21 +06:00
Nabin Hait
2e66a842bb Merge pull request #1170 from akhileshdarjee/master
[fix] [minor] rename fix for customer and supplier
2013-12-11 23:29:18 -08:00
Nabin Hait
ca02db5006 Merge pull request #1175 from nabinhait/hotfix
[fix] [minor] Negative outstanding validation for JV against JV
2013-12-11 23:22:28 -08:00
Nabin Hait
13fc64d732 [fix] [minor] Negative outstanding validation for JV against JV 2013-12-12 12:50:42 +05:30
Akhilesh Darjee
7d4c2d62bf [fix] [minor] allowed renaming for address and contact 2013-12-12 12:32:43 +05:30
Nabin Hait
ffa938a3fb Merge pull request #1174 from nabinhait/hotfix
[fix] [minor] convert serial no to upper case for comparing
2013-12-11 22:28:50 -08:00
Nabin Hait
9d835a039a [fix] [minor] convert serial no to upper case for comparing 2013-12-12 11:56:56 +05:30
Akhilesh Darjee
229b246d6d [fix] [minor] production planning tool clear sales order table 2013-12-11 18:49:11 +05:30
Akhilesh Darjee
42a8fc2ee3 [fix] [minor] stashed sales_invoice.txt 2013-12-11 11:15:03 +05:30
Akhilesh Darjee
f0dad52aaa [fix] [minor] merge conflict fix 2013-12-10 18:11:31 +05:30
Akhilesh Darjee
aebb9f422b [fix] [minor] merge conflict fixes 2013-12-10 18:01:18 +05:30
Akhilesh Darjee
4e677a3f52 [fix] [minor] stashed bom.txt 2013-12-10 15:23:07 +05:30
Akhilesh Darjee
abefa3fd40 [fix] [minor] supplier & customer rename fix 2013-12-10 14:22:52 +05:30
Akhilesh Darjee
5d3da6c095 [fix] [minor] rename fix for customer and supplier 2013-12-10 11:18:08 +05:30
Pratik Vyas
ba82163d53 Merge develop for release 2013-12-09 17:16:05 +05:30
Pratik Vyas
e4bb2ba158 bumped to version 3.1.2 2013-12-09 17:41:11 +06:00
Anand Doshi
c9df05126a Merge pull request #1167 from akhileshdarjee/master
[fix] [minor] customer name visibility fixed in sales invoice
2013-12-09 03:03:39 -08:00
Akhilesh Darjee
5ce1b8b8f9 [fix] [minor] customer name visibility fixed in sales invoice 2013-12-09 16:29:04 +05:30
Akhilesh Darjee
7b1d9409f1 [fix] [minor] remove email patch 2013-12-09 15:57:26 +05:30
Akhilesh Darjee
a652347bd1 [fix] [minor] customer_name not visible in sales invoice 2013-12-09 15:52:47 +05:30
Anand Doshi
dc68b2e7ab Merge pull request #1154 from anandpdoshi/hotfix
[minor] added simplified and traditional chinese in languages list
2013-12-09 00:43:25 -08:00
Anand Doshi
46b18475a3 Merge pull request #1157 from pdvyas/slow-migration-patch-fix
[minor] make slow branch migratable to master
2013-12-08 22:39:29 -08:00
Pratik Vyas
32e7b30744 bumped to version 3.1.1 2013-12-08 17:17:05 +06:00
Akhilesh Darjee
d9255abd46 [fix] [minor] set send_print_in_body_and_attachment in email settings 2013-12-06 18:49:48 +05:30
Nabin Hait
18098c9c78 Merge pull request #1160 from webnotes/develop
[hotfix] fix null issue in budget variance
2013-12-06 01:26:49 -08:00
Pratik Vyas
1417c6d58f [hotfix] fix null issue in budget variance 2013-12-06 14:50:06 +05:30
Pratik Vyas
d701e83961 [minor] make slow branch migratable to master 2013-12-05 18:05:07 +05:30
Akhilesh Darjee
afc44cf54e [fix] [minor] email settings - set send print in body and attachment 2013-12-05 17:42:53 +05:30
Pratik Vyas
c3d8b06623 bumped to version 3.1.0 2013-12-05 16:56:37 +06:00
Pratik Vyas
dcd928ca61 Merge develop for release 2013-12-05 16:21:35 +05:30
Nabin Hait
fc1b4f858c Merge pull request #1155 from nabinhait/report1
[report] stock ledger loading time
2013-12-05 02:48:19 -08:00
Nabin Hait
c8c13b90ce [report] stock ledger loading time 2013-12-05 16:08:30 +05:30
Anand Doshi
e587c689a3 [minor] added simplified and traditional chinese in languages list 2013-12-05 13:04:24 +05:30
Nabin Hait
9fd2d79fc7 Merge pull request #1149 from anandpdoshi/hotfix
In Website Contact form, if Support is selected from first dropdown, a S...
2013-12-04 21:08:06 -08:00
Nabin Hait
ca8f87903c Merge pull request #1147 from nabinhait/hotfix1
[fix] [minor] fetch items from bom while repacking
2013-12-04 03:35:52 -08:00
Nabin Hait
281a2d2bd1 [fix] [minor] fetch items from bom while repacking 2013-12-04 17:04:58 +05:30
Anand Doshi
cca731901b Merge pull request #1118 from rmehta/chinese
[language] Added zh-cn and zh-tw webnotes/erpnext#1099
2013-12-04 03:15:54 -08:00
Anand Doshi
df019807a9 In Website Contact form, if Support is selected from first dropdown, a Support Ticket should be created instead of a Lead Communication 2013-12-04 16:28:31 +05:30
Nabin Hait
80d9514636 Merge pull request #1141 from nabinhait/hotfix
[fix] [minor] Master name validation for customer/supplier/warehouse acc...
2013-12-04 01:50:13 -08:00