Commit Graph

7864 Commits

Author SHA1 Message Date
Rushabh Mehta
df200f305b Redesigned templates. Now all templates must be inside templates/pages templates/generators 2013-12-25 15:19:22 +05:30
Rushabh Mehta
3c68488873 Fixes to setup wizard 2013-12-24 18:51:49 +05:30
Rushabh Mehta
30fb30cffb Merge pull request #1 from pdvyas/testing
add travis ci
2013-12-24 05:21:21 -08:00
Pratik Vyas
f437e867fd add travis ci 2013-12-24 12:17:59 +05:30
Rushabh Mehta
b63d550a70 Added Applications page and fixed issues in translations and hooks 2013-12-23 16:09:00 +05:30
Rushabh Mehta
2b08985e16 Translations redesigned webnotes/wnframework#351 2013-12-19 18:27:48 +05:30
Rushabh Mehta
91e9822f65 fixed test cases webnotes/wnframework#351 2013-12-16 18:43:42 +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
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
Rushabh Mehta
1f84799f2d install, web serving, session booting webnotes/wnframework#351 2013-12-12 19:12:19 +05:30
Rushabh Mehta
d2dd83c3a3 fixed template loader webnotes/wnframework#351 2013-12-12 13:57:58 +05:30
Pratik Vyas
1b23208779 [minor] get bundle working, almost 2013-12-12 10:44:38 +05:30
Rushabh Mehta
39bb8e2ed4 step 0: install 2013-12-11 15:32:14 +05:30
Rushabh Mehta
e460aa277b added setup.py 2013-12-11 11:32:21 +05:30
Rushabh Mehta
b234a3545a moved config.json inside erpnext 2013-12-11 10:55:55 +05:30
Rushabh Mehta
afea58b7a1 moved modules inside erpnext folder 2013-12-11 10:43:52 +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
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
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
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