Commit Graph

7859 Commits

Author SHA1 Message Date
Akhilesh Darjee
7d4c2d62bf [fix] [minor] allowed renaming for address and contact 2013-12-12 12:32:43 +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
Nabin Hait
c2da052c80 [fix] [minor] make bank voucher from salary manager 2013-12-04 15:18:11 +05:30
Nabin Hait
40580d5d01 [fix] [minor] Master name validation for customer/supplier/warehouse account 2013-12-04 15:18:11 +05:30
Nabin Hait
32803f8635 Merge pull request #1144 from akhileshdarjee/master
[fix] [minor] bom operations fix
2013-12-03 22:33:10 -08:00
Akhilesh Darjee
245200f129 [fix] [minor] bom operations fix 2013-12-04 11:54:13 +05:30
Rushabh Mehta
28b33dfdd7 [patch] startup.js styling 2013-12-04 11:16:38 +05:30
Nabin Hait
c94891cc8e Merge pull request #1139 from akhileshdarjee/master
[report] payment collection with ageing and payment made with ageing merged to payment period based on invoice date
2013-12-03 21:25:32 -08:00
Akhilesh Darjee
72f689b1f9 [fix] [minor] setup print fix in sales invoice 2013-12-04 10:46:55 +05:30
Akhilesh Darjee
7e37b00d0a [fix] [minor] merge conflict fixed 2013-12-02 18:02:45 +05:30
Akhilesh Darjee
9c0569ee2d [report] payment collection with ageing and payment made with ageing merged to payment period based on invoice date 2013-12-02 17:58:23 +05:30
Anand Doshi
21ce1282ca Merge pull request #1138 from anandpdoshi/hotfix
Shopping cart cookie fixes
2013-12-02 02:42:04 -08:00
Anand Doshi
365c24173a [minor] [fix] shopping cart cookies 2013-12-02 16:08:26 +05:30
Nabin Hait
580fd26147 Merge pull request #1137 from nabinhait/hotfix
[fix] [minor] removed duplicate validation for sales bom
2013-12-02 02:01:20 -08:00
Nabin Hait
5ff03e460b [fix] [minor] removed duplicate validation for sales bom 2013-12-02 15:28:55 +05:30
Nabin Hait
3027241150 Merge pull request #1136 from anandpdoshi/migrate-grid-reports
[minor] stock ledger report as script report
2013-12-02 00:57:23 -08:00
Anand Doshi
56a3165ac8 [minor] stock ledger report as script report
Issue #1121
2013-12-02 12:49:02 +05:30
Pratik Vyas
7e8f98368a [fix] allow lot of queries in update comments patch 2013-11-29 19:57:38 +05:30
Nabin Hait
aab81bb8c5 Merge pull request #1119 from akhileshdarjee/supplier-report
[report] item-wise consumption in buying module
2013-11-29 03:54:38 -08:00