Commit Graph

9746 Commits

Author SHA1 Message Date
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
01d2811ccd [report] migrated stock level report to script report and renamed to Stock Projected Qty 2013-12-04 19:16:50 +05:30
Nabin Hait
690c75fa0d [report] migrated stock level report to script report and renamed to Stock Projected Qty 2013-12-04 19:16:32 +05:30
Nabin Hait
462401c4df [minor] fixed conflict 2013-12-04 17:26:22 +05:30
Nabin Hait
1b5de63163 Merge branch 'hotfix' into reports 2013-12-04 17:23:45 +05:30
Nabin Hait
9b0a6d426c [patch] [minor] deleted old stock ledger and stock ageing page 2013-12-04 17:18:05 +05:30
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
Nabin Hait
bc6df5c71b [patch] [minor] deleted old stock ledger and stock ageing page 2013-12-04 16:42:23 +05:30
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
Nabin Hait
47e40242bd [minor] removed old stock ageing grid report 2013-12-02 23:13:36 +05:30
Nabin Hait
7eb90d3d5c Stock Ageing report migated to Script report 2013-12-02 20:12:18 +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
Anand Doshi
cad4ed17fa Merge pull request #1132 from anandpdoshi/hotfix
[minor] patch list and demo
2013-11-29 03:22:42 -08:00
Anand Doshi
39896233fa [minor] patch list 2013-11-29 16:41:09 +05:30
Akhilesh Darjee
be948b8b40 [fix] [minor] supplier wise sales analytics report totals added 2013-11-29 16:37:07 +05:30
Akhilesh Darjee
b1269b4a07 [report] item-wise consumption renamed to supplier-wise sales analytics 2013-11-29 16:08:26 +05:30
Akhilesh Darjee
4fb848d3c4 [report] item-wise consumption in buying module 2013-11-29 15:15:34 +05:30
Rushabh Mehta
9115e2cf72 [language] Added zh-cn and zh-tw webnotes/erpnext#1099 2013-11-29 15:01:33 +05:30
Anand Doshi
da07ed0ae8 [minor] demo and item 2013-11-29 14:53:56 +05:30
Anand Doshi
974203b1f3 Merge pull request #1117 from anandpdoshi/hotfix
[minor] fixed erpnext.org urls
2013-11-28 21:43:20 -08:00
Anand Doshi
a6a6b5cb56 [minor] fixed erpnext.org urls 2013-11-29 11:09:38 +05:30
Rushabh Mehta
543c13c750 Merge pull request #1116 from rmehta/master
[minor] Lead bugfix webnotes/erpnext#1115
2013-11-28 21:34:11 -08:00
Rushabh Mehta
e8aaf4b92f [minor] Lead bugfix webnotes/erpnext#1115 2013-11-29 11:03:33 +05:30
Anand Doshi
acc86a8413 Merge pull request #1112 from pdvyas/versioning
Semantic Versioning
2013-11-28 03:30:48 -08:00
Anand Doshi
844913a364 Merge pull request #1114 from rmehta/reports
[report] Customer Acquisition and Loyalty
2013-11-28 03:28:19 -08:00