Commit Graph

1637 Commits

Author SHA1 Message Date
Nabin Hait
7f82256394 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-09 15:27:03 +05:30
Nabin Hait
68f9ad31ae serialized inventory fixes : serial no for sales bom child item and rejected qty 2012-05-09 15:26:27 +05:30
Rushabh Mehta
be93aa027f cms fixes 2012-05-09 14:44:40 +05:30
Rushabh Mehta
fa390039ff cms fixes 2012-05-09 14:41:36 +05:30
Rushabh Mehta
caf4e374ab cms fixes 2012-05-09 14:40:44 +05:30
Rushabh Mehta
9454ccc5b8 cms fixes 2012-05-09 14:35:00 +05:30
Rushabh Mehta
cb1f1d81aa cms patch 2012-05-09 14:10:49 +05:30
Rushabh Mehta
e45042e011 merge 2012-05-09 12:22:50 +05:30
Rushabh Mehta
b9483d1809 cms updates 2012-05-09 11:42:52 +05:30
Anand Doshi
c241a476ab moved shipping address in basic info section 2012-05-09 11:07:15 +05:30
Rushabh Mehta
458ca8eddb cms fixes 2012-05-09 10:17:08 +05:30
Nabin Hait
a6b8e84f09 removed whong depends on value 2012-05-08 17:18:40 +05:30
Rushabh Mehta
a933b632ad templates cleaner and generation for all pages 2012-05-08 16:06:44 +05:30
Rushabh Mehta
5ab8163140 fixes to routing and activating web page 2012-05-08 12:58:32 +05:30
Nabin Hait
6d6ca4bdb8 mapper fix 2012-05-08 11:51:35 +05:30
Rushabh Mehta
c22d9e03e7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into cms 2012-05-08 11:02:58 +05:30
Rushabh Mehta
a920943e43 new cms with public folder 2012-05-07 18:00:57 +05:30
Nabin Hait
c22bd05bb5 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-07 17:35:45 +05:30
Nabin Hait
5375627bca stock reco issue fixed 2012-05-07 17:35:15 +05:30
Anand Doshi
a00852ce19 fix in purchase receipt - show challan no for indian customers 2012-05-07 16:59:28 +05:30
Nabin Hait
12ec1db2fa Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-07 12:00:00 +05:30
Nabin Hait
5f4ca56fd1 Fixes related to renamedt 2012-05-07 11:59:23 +05:30
Rushabh Mehta
7ef15ce7fe Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-07 10:44:24 +05:30
Rushabh Mehta
252664e288 remove unsupported for google 2012-05-07 10:43:18 +05:30
Anand Doshi
ebc3b87f8d Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-05 20:06:43 +05:30
Anand Doshi
f36aee2c6b fix in contact address saving issue 2012-05-05 20:05:58 +05:30
Nabin Hait
875ccac151 stock reco cancellation issue fxed 2012-05-04 18:48:30 +05:30
Nabin Hait
b5d50dcc53 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-04 17:56:00 +05:30
Nabin Hait
ce4d297641 rename dt in custom search criteria 2012-05-04 17:55:32 +05:30
Anand Doshi
29d36a6cea fixes in account setup 2012-05-04 16:20:30 +05:30
Anand Doshi
bc1d74dbfe fix in landed cost master query 2012-05-04 13:13:44 +05:30
Anand Doshi
837baee1b4 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-04 13:05:36 +05:30
Anand Doshi
cc1583de88 fix in landed cost master 2012-05-04 13:04:40 +05:30
Nabin Hait
8cf9934b93 Trend analyzer issue fixed 2012-05-04 12:52:56 +05:30
Nabin Hait
978a1e0e46 field rearranged in sales invoice 2012-05-04 11:57:55 +05:30
Nabin Hait
ff81c37689 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-04 11:46:38 +05:30
Nabin Hait
0fb4eeb5bb cancellation issue fixed in stock reco 2012-05-04 11:46:07 +05:30
Rushabh Mehta
f9c766ad3a login-topbar id fix 2012-05-04 11:41:57 +05:30
Rushabh Mehta
7f5791ba1e jv, search fix 2012-05-04 10:10:30 +05:30
Rushabh Mehta
22cd09beb3 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-04 10:02:51 +05:30
Rushabh Mehta
5a774db021 delivery, not and sales_bom 2012-05-04 10:02:09 +05:30
Nabin Hait
7c60fc13b2 reports fixed: itemwise sales/delivery report 2012-05-03 18:22:32 +05:30
Nabin Hait
a67f706c92 options did not updated in stock entry 2012-05-03 18:09:15 +05:30
Nabin Hait
0f11df13bb Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-03 17:50:06 +05:30
Nabin Hait
d8df7b5884 quotation fix 2012-05-03 17:49:45 +05:30
Anand Doshi
f09bd67e53 fix in security settings 2012-05-03 16:44:54 +05:30
Anand Doshi
ee9863cfce Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-03 16:27:20 +05:30
Anand Doshi
4b6c1f8de5 fixes in notification control due to renaming of doctype 2012-05-03 16:26:38 +05:30
Nabin Hait
d315cb5eb7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-03 14:55:36 +05:30
Nabin Hait
dc7ffe47b2 fixes in quotation 2012-05-03 14:55:21 +05:30
Nabin Hait
16b6386648 fixes in quotation 2012-05-03 14:41:35 +05:30
Anand Doshi
47fac1804b Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-03 13:23:32 +05:30
Anand Doshi
359852e3d9 fix in email digest 2012-05-03 13:23:06 +05:30
Nabin Hait
618331672d Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-03 13:10:52 +05:30
Nabin Hait
32826a8cf1 fixes in customerwise price list 2012-05-03 13:10:34 +05:30
Anand Doshi
57bc3f424f fix in email digest 2012-05-03 12:57:56 +05:30
Anand Doshi
996abdd155 fix in email digest 2012-05-03 12:48:44 +05:30
Anand Doshi
a467eee917 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-03 12:38:01 +05:30
Anand Doshi
e5982c0399 email digest fixes 2012-05-03 12:37:26 +05:30
Rushabh Mehta
ce02a74dbc login id for topbar 2012-05-03 10:57:03 +05:30
Rushabh Mehta
39489278ec update messages fix 2012-05-03 10:44:44 +05:30
Rushabh Mehta
28bb342f96 list view for purchase receipt 2012-05-03 10:41:19 +05:30
Rushabh Mehta
3d0c9ba22d added listview for stock entry, listview templates 2012-05-03 10:35:51 +05:30
Rushabh Mehta
182569feb0 shipping address on top for delivery note 2012-05-03 10:28:23 +05:30
Rushabh Mehta
acd0769098 list in listview and sales order fix 2012-05-03 10:20:38 +05:30
Nabin Hait
8c04a1fe77 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 17:59:20 +05:30
Nabin Hait
b92d9ef618 removed patch file specific to bullows 2012-05-02 17:58:13 +05:30
Rushabh Mehta
d5e1031f42 floating logo on left 2012-05-02 17:44:59 +05:30
Nabin Hait
52ca9a1ed1 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 16:05:15 +05:30
Nabin Hait
00ba2ce8b4 fixes in sales and pur return 2012-05-02 16:04:42 +05:30
Rushabh Mehta
f2c3db6e83 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 15:30:58 +05:30
Rushabh Mehta
4ee56c064e added ace editor 2012-05-02 15:30:15 +05:30
Nabin Hait
a4561e14aa patch list updated 2012-05-02 14:58:53 +05:30
Nabin Hait
7ef8168dbc Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 14:56:17 +05:30
Nabin Hait
afb704c940 rename fix in prev doctype 2012-05-02 14:56:00 +05:30
Rushabh Mehta
30ab0227b3 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 13:45:25 +05:30
Rushabh Mehta
aa51377e94 custom startup 2012-05-02 13:03:41 +05:30
Anand Doshi
187ac7ccf1 delete question-view page 2012-05-02 12:23:44 +05:30
Anand Doshi
60118662ff delete question-view page 2012-05-02 12:23:05 +05:30
Anand Doshi
b1f46c80b2 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 12:21:53 +05:30
Anand Doshi
e876ac2005 delete question-view page 2012-05-02 12:21:27 +05:30
Nabin Hait
a4e9a52ea3 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 12:19:59 +05:30
Nabin Hait
ab96d12086 fixes in customerwise price list 2012-05-02 12:19:33 +05:30
Rushabh Mehta
7b4a60a980 form toolbar lables and support ticket fix 2012-05-02 11:35:04 +05:30
Nabin Hait
c55d83b36e Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 10:36:29 +05:30
Nabin Hait
dd200d363e cleanup property setter patch 2012-05-02 10:36:16 +05:30
Nabin Hait
50a0cadb9f cleanup property setter patch 2012-05-02 10:32:28 +05:30
Rushabh Mehta
b21307767d Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 10:22:20 +05:30
Rushabh Mehta
a0571fe570 toolbar fix for null 2012-05-02 10:20:40 +05:30
Nabin Hait
8d6917dc04 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-02 10:00:44 +05:30
Nabin Hait
07c3b399f6 field arrngement fix 2012-05-02 10:00:03 +05:30
Rushabh Mehta
8eba118379 font fix 2012-05-02 09:45:28 +05:30
Anand Doshi
98ae634c50 fixes in sales order item widths 2012-05-01 18:31:40 +05:30
Nabin Hait
722bbd8ef0 JV fix 2012-05-01 16:36:51 +05:30
Nabin Hait
5af62d0857 fixed conflict using theirs 2012-05-01 16:29:40 +05:30
Nabin Hait
796505a83e field arrangement in purchase and stock cycle 2012-05-01 16:26:16 +05:30
Rushabh Mehta
8360a5f729 no address in footer 2012-05-01 16:23:05 +05:30
Rushabh Mehta
c59fc6623b Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-01 16:15:37 +05:30
Rushabh Mehta
39c47a0b4b blog sequence 2012-05-01 16:15:09 +05:30
Anand Doshi
23e777545a fix in naming series patch's execution 2012-05-01 16:05:23 +05:30
Rushabh Mehta
58bf2379a0 double dashbaord 2012-05-01 15:18:26 +05:30
Rushabh Mehta
ef048f7256 fix to profile_settings 2012-05-01 14:56:20 +05:30
Rushabh Mehta
30e3f157bc fix to startupjs 2012-05-01 14:07:41 +05:30
Rushabh Mehta
efed5239f0 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-05-01 13:43:03 +05:30
Rushabh Mehta
6f8e9e951e website fixes 2012-05-01 13:41:44 +05:30
Nabin Hait
57d7c815d2 field arrangement in sales cycle 2012-05-01 12:35:12 +05:30
Anand Doshi
3f6eed2dc2 fix in account subscription info box creation 2012-05-01 12:23:28 +05:30
Nabin Hait
926f46f04a Fixed conflict while merging with master 2012-05-01 11:51:08 +05:30
Nabin Hait
d58da50f50 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-01 11:37:45 +05:30
Nabin Hait
2ade43a647 field arrangement in sales cycle 2012-05-01 11:37:13 +05:30
Nabin Hait
1e335f3272 fixes in validattion of debit to account with customer in sales invoice 2012-05-01 10:53:50 +05:30
Nabin Hait
41c62727c7 fixes in validattion of debit to account with customer in sales invoice 2012-05-01 10:45:47 +05:30
Anand Doshi
563fcc1b05 fix in startup.js 2012-04-30 21:06:31 +05:30
Anand Doshi
5c2a792d03 if max_users = 0, consider unlimited users 2012-04-30 20:03:23 +05:30
Anand Doshi
954567b87f Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 20:01:00 +05:30
Anand Doshi
4b2b159d12 if max_users = 0, consider unlimited users 2012-04-30 20:00:19 +05:30
Rushabh Mehta
45850fe496 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 18:38:40 +05:30
Anand Doshi
84777ac457 change in expiry message 2012-04-30 18:33:32 +05:30
Rushabh Mehta
2ab4451d1b Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 18:05:47 +05:30
Nabin Hait
228d03ec01 posting time fix 2012-04-30 16:59:39 +05:30
Rushabh Mehta
79a664b4dc cleaned up lead, opportunity, jv 2012-04-30 16:12:03 +05:30
Anand Doshi
72308564be Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 15:44:02 +05:30
Anand Doshi
2aa9ba63e3 fixes in select field type 2012-04-30 15:43:34 +05:30
Nabin Hait
41cc32790f Fixed issie in auto notification 2012-04-30 14:36:18 +05:30
Rushabh Mehta
542acf6757 website, product and grid bugfix 2012-04-30 14:23:12 +05:30
Rushabh Mehta
963c651f2c Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 14:22:50 +05:30
Rushabh Mehta
a4be4d3390 website, product and grid bugfix 2012-04-30 14:22:02 +05:30
Anand Doshi
b60807c325 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-30 12:23:03 +05:30
Anand Doshi
c55d9ad033 working on setup account 2012-04-30 12:22:47 +05:30
Anand Doshi
8cffe7e440 fix in support ticket, expiry banner 2012-04-30 12:13:51 +05:30
Nabin Hait
28b9551acf fixes in patch 2012-04-30 11:55:25 +05:30
Nabin Hait
d1ac71c3e7 patch list updated 2012-04-30 11:53:58 +05:30
Nabin Hait
d4c5a9e2c4 fixes in bin 2012-04-30 11:50:34 +05:30
Nabin Hait
3e8f35c09e fixes in bin 2012-04-30 11:47:45 +05:30
Nabin Hait
fc51f995c8 fixes in bin 2012-04-30 11:43:16 +05:30
Rushabh Mehta
30cb5c20a1 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-27 18:39:56 +05:30
Rushabh Mehta
389880d0b6 more website cleanups 2012-04-27 18:39:14 +05:30
Nabin Hait
7ff69e10bf repost stock for entries where posting time goes wrong 2012-04-27 18:27:06 +05:30
Nabin Hait
ebbd328977 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-27 18:15:13 +05:30
Anand Doshi
f5216b46e3 fixes 2012-04-27 18:03:47 +05:30
Nabin Hait
914d67a1a3 selective deletes from child table while overwriting 2012-04-27 17:47:46 +05:30
Anand Doshi
864e220ec5 fixes in serial no patch 2012-04-27 17:12:47 +05:30
Anand Doshi
d461148296 fix in reload_c_form path 2012-04-27 17:05:50 +05:30
Anand Doshi
3fbf2ec0c5 fix in setup control 2012-04-27 16:11:56 +05:30
Anand Doshi
1dac43159a Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-27 15:31:35 +05:30
Anand Doshi
1ed4ef1946 fixes in setup 2012-04-27 15:30:23 +05:30
Nabin Hait
201f8ca821 fixed conflict in sales bom using ours 2012-04-27 14:03:06 +05:30
Nabin Hait
b931f37735 fixed conflict using ours 2012-04-27 13:59:39 +05:30
Nabin Hait
0d1daa8875 fld order change 2012-04-27 13:56:58 +05:30
Nabin Hait
de975ff307 fixed filtering issue in gs 2012-04-27 13:53:20 +05:30
Nabin Hait
762056aaa8 sales bom amendment issue fixed 2012-04-27 11:06:12 +05:30
Nabin Hait
727431b7b1 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-27 11:04:44 +05:30
Nabin Hait
b9d3ade2f4 sales bom issue fixed 2012-04-27 11:04:11 +05:30
Rushabh Mehta
2e16a01efd Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-26 19:02:32 +05:30
Rushabh Mehta
702473d65e website updates 2012-04-26 19:01:35 +05:30
Nabin Hait
92ec4dcb6f minor fixes 2012-04-26 13:13:10 +05:30
Nabin Hait
2453740621 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-26 13:03:18 +05:30
Nabin Hait
a6b7886175 resolved conflict while merging with master 2012-04-26 13:02:36 +05:30
Nabin Hait
50c799880a Merge branch 'master' of github.com:webnotes/erpnext 2012-04-26 12:47:30 +05:30
Nabin Hait
5a6e641565 fixed batch issue 2012-04-26 11:11:34 +05:30
Rushabh Mehta
44279f87b4 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-25 18:25:29 +05:30
Nabin Hait
aa577ed82e serial no fixes: sle creation through import data 2012-04-25 18:25:13 +05:30
Rushabh Mehta
dcfdfc317c fixes to website module and fixed rename and double column bugs 2012-04-25 18:24:44 +05:30
Nabin Hait
04a276c934 Error fixed in gl netry when negative entry and cancel event 2012-04-25 16:08:45 +05:30
Nabin Hait
ed7de5fee2 posting time format validation 2012-04-25 15:07:46 +05:30
Nabin Hait
4626b27038 updated sales bom document 2012-04-24 15:17:56 +05:30
Nabin Hait
d98ca01082 fixed wrong serial no qty validation 2012-04-24 14:07:04 +05:30
Nabin Hait
3afecb9e30 update permission in appraisal 2012-04-24 13:32:26 +05:30
Nabin Hait
9a6dbfca8f updated permlevel in address 2012-04-24 12:40:50 +05:30
Nabin Hait
dd828be432 updated patch list 2012-04-24 12:25:39 +05:30
Nabin Hait
3fb741c3ef update role in address 2012-04-24 12:23:12 +05:30
Nabin Hait
663e971557 Make next document button hide/unhide 2012-04-24 11:39:54 +05:30
Nabin Hait
e6d808820a Error fixed in notification control 2012-04-24 11:06:48 +05:30
Nabin Hait
4c9525139d Error fixed in stock ledger netry batch related 2012-04-24 10:38:37 +05:30
Nabin Hait
8f9a953931 Update erpnext/accounts/doctype/ledger_balance_export/ledger_balance_export.py 2012-04-23 19:00:39 +05:30
Nabin Hait
69f6d79791 patch list modified 2012-04-23 18:27:53 +05:30
Nabin Hait
a45f44d805 remove def val from rv detail cost center 2012-04-23 18:26:08 +05:30
Nabin Hait
e848300958 patch list modified 2012-04-23 18:24:22 +05:30
Nabin Hait
ca102d567e change cacheitem schema 2012-04-23 18:23:17 +05:30
Nabin Hait
2bbb086b10 Update erpnext/accounts/doctype/rv_detail/rv_detail.txt 2012-04-23 17:57:18 +05:30
Nabin Hait
9ceaccce86 create custom flds for bullows account 2012-04-23 16:04:41 +05:30
Nabin Hait
c425d8bd16 after sync cleanup 2012-04-23 16:04:16 +05:30
Nabin Hait
708917db50 some fixes in cleanup 2012-04-23 16:03:38 +05:30
Nabin Hait
6dbfcdbe5c Merge branch 'master' of github.com:webnotes/erpnext 2012-04-23 14:03:22 +05:30
Nabin Hait
b743bb6c10 ledger bal export format changed 2012-04-23 14:03:07 +05:30
Nabin Hait
51834a45a7 purchase invoice with write off feature 2012-04-23 12:47:12 +05:30
Nabin Hait
15230eb955 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-23 12:17:41 +05:30
Nabin Hait
6ed865f89a Fld label based on currency 2012-04-23 10:37:28 +05:30
Rushabh Mehta
f4a8c87db5 kb bug fix 2012-04-23 10:31:29 +05:30
Nabin Hait
a8d83b6c51 update modified date 2012-04-20 14:02:44 +05:30
Nabin Hait
f19bb52b2a Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 13:59:22 +05:30
Nabin Hait
f7c506d69e fixed conflict while merging with master branch 2012-04-20 13:58:43 +05:30
Anand Doshi
3d9f436ce9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 13:43:05 +05:30
Anand Doshi
0f8e491bdd removed Knowledge Base module, fixed questions page name 2012-04-20 13:42:43 +05:30
Nabin Hait
e72ae2a19b fixed conflict 2012-04-20 13:41:09 +05:30
Rushabh Mehta
5bce61d58e merge 2012-04-20 13:40:48 +05:30
Rushabh Mehta
f30d1a0515 report builder - sort, save, pre-select columns, Report DocType 2012-04-20 13:37:49 +05:30
Nabin Hait
0788570ce7 automatically write off feature in sales invoice 2012-04-20 13:31:05 +05:30
Anand Doshi
b301251090 Store base currency on client side 2012-04-20 11:51:27 +05:30
Anand Doshi
9e0221c58e Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 11:22:38 +05:30