Commit Graph

385 Commits

Author SHA1 Message Date
Anand Doshi
a773e5251b reload address in address title patch 2012-12-27 18:10:45 +05:30
Anand Doshi
9ea03f371a Merged conflict 2012-12-27 18:07:29 +05:30
Rushabh Mehta
43eb513a43 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-27 16:50:55 +05:30
Rushabh Mehta
1b1517155b added about us page and settings 2012-12-27 16:50:24 +05:30
Nabin Hait
562de92070 removed project related doctype mapper 2012-12-27 15:14:27 +05:30
Rushabh Mehta
5f1d57ecb7 address now not in dialog, added slideshows in products and groups and removed transaction history from customer / supplier / sales partner 2012-12-27 14:05:02 +05:30
Anand Doshi
98d588cd7d deprecated form 16 print format 2012-12-25 18:53:25 +05:30
Anand Doshi
b7f0cbf914 fix in production order patch 2012-12-25 18:43:15 +05:30
Rushabh Mehta
7285a720a0 added patch to rebuild item group tree 2012-12-25 18:24:35 +05:30
Rushabh Mehta
f50c012808 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-25 15:09:58 +05:30
Rushabh Mehta
7837d80716 fixes to website, item (added table for cross listing), modules_setup and form_header 2012-12-25 15:09:14 +05:30
Nabin Hait
ed92841868 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-24 18:47:57 +05:30
Nabin Hait
68431e9cb3 restored 'use multi level bom' in production order 2012-12-24 18:47:18 +05:30
Anand Doshi
f5d90abe92 addchild will never save added doc 2012-12-24 17:02:38 +05:30
Anand Doshi
acc36be87f patch to fix deleted contact and addresses 2012-12-21 20:57:03 +05:30
Anand Doshi
2353b90e7a fixed production order patch 2012-12-20 17:08:57 +05:30
Anand Doshi
69f855ebfb changed production to manufacturing in reload doc 2012-12-20 17:06:44 +05:30
Anand Doshi
8ac9e687bd fix in patch 2012-12-20 16:53:33 +05:30
Nabin Hait
2880a55a01 production order naming series patch 2012-12-20 16:00:27 +05:30
Anand Doshi
1107d50a59 reload stock entry before running custom fields patch 2012-12-20 12:42:16 +05:30
Anand Doshi
879ec66ea3 Merge branch 'production' of github.com:webnotes/erpnext into production
Conflicts:
	accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
	buying/doctype/purchase_order_item/purchase_order_item.txt
	buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
	patches/patch_list.py
2012-12-19 22:28:00 +05:30
Rushabh Mehta
40ca2c681a removed next_contact in quotation, fixed regex to convert relative links to absolute 2012-12-19 12:46:03 +05:30
Nabin Hait
1a6a94b760 stock entry cleanup 2012-12-18 18:42:02 +05:30
Nabin Hait
5f175dfd00 Merge branch 'master' into production 2012-12-18 13:49:07 +05:30
Nabin Hait
bf52eb08a6 stock entry cleanup patch 2012-12-18 10:29:06 +05:30
Anand Doshi
56359f06f6 patch to clear web cache 2012-12-17 16:14:26 +05:30
Nabin Hait
5ca0f44890 bom cleanup 2012-12-14 19:00:42 +05:30
Nabin Hait
3adaf607f0 bom cleanup 2012-12-14 14:25:51 +05:30
Nabin Hait
f8de5b9878 merged with master 2012-12-14 10:43:56 +05:30
Anand Doshi
72d2a627f5 replace createLocal in Client script only 2012-12-13 19:35:32 +05:30
Nabin Hait
d5d54c24b5 fixed conflict 2012-12-13 18:39:08 +05:30
Nabin Hait
9db3b6dc71 replace createlocal 2012-12-13 18:36:49 +05:30
Rushabh Mehta
8a4ceb98c2 remove hyphen from file_list 2012-12-13 15:24:33 +05:30
Rushabh Mehta
686022f777 fixes to recent patch and removed company_control, home_control, webforms, wip_monitor 2012-12-12 15:25:51 +05:30
Rushabh Mehta
73ccac4ccb moved recent to memcache 2012-12-12 14:42:17 +05:30
Nabin Hait
c52edd1e59 production cleanup 2012-12-11 18:38:58 +05:30
Anand Doshi
d3e04c3185 fixed syntax error in patch list 2012-12-11 15:25:06 +05:30
Anand Doshi
038d7aae9b Merge branch 'production' of github.com:webnotes/erpnext into production 2012-12-11 15:22:40 +05:30
Nabin Hait
559c16fabb production cleanup patch 2012-12-11 15:18:51 +05:30
Nabin Hait
52a70832d6 Merge branch 'production' of github.com:webnotes/erpnext into production 2012-12-11 15:15:04 +05:30
Nabin Hait
bfcc16af17 rebuilt exploded bom items patch 2012-12-11 15:14:30 +05:30
Anand Doshi
c551964d5d Merge branch 'master' into production
Conflicts:
	patches/patch_list.py
	production/doctype/bom_explosion_item/bom_explosion_item.txt
2012-12-11 14:59:19 +05:30
Anand Doshi
36bf910563 removed Standard from default print format 2012-12-11 14:01:59 +05:30
Anand Doshi
3519d7de01 fixed production cleanup patch 2012-12-10 19:37:49 +05:30
Nabin Hait
05de088473 merge, fixed production cleanup patch 2012-12-10 19:28:38 +05:30
Nabin Hait
1ea0944586 rename production to manufacturing 2012-12-10 19:02:38 +05:30
Anand Doshi
89e2dd8dbb rename Production --> Manufacturing and delete old patches 2012-12-10 19:01:31 +05:30
Nabin Hait
822022082d removed BOM Control and Production Control 2012-12-10 18:13:34 +05:30
Rushabh Mehta
aaa36874bc patch fix 2012-12-06 16:49:18 +05:30
Rushabh Mehta
95018866de sitemap / rss: path fix 2012-12-06 16:47:27 +05:30
Rushabh Mehta
87192da372 website updates and leave balance bugfix 2012-12-06 16:45:00 +05:30
Nabin Hait
27184e0e05 default filters set in debtors and creditors ledger 2012-12-06 11:46:41 +05:30
Rushabh Mehta
ed29af98a9 message updates in Leave / Expense, catch localstorage error 2012-12-05 17:06:07 +05:30
Rushabh Mehta
38f19104d8 merge 2012-12-05 16:49:58 +05:30
Nabin Hait
598dd99144 repost projected qty 2012-12-05 15:58:57 +05:30
Rushabh Mehta
ba9e034069 added patch for expense and leave 2012-12-05 15:51:17 +05:30
Nabin Hait
ec83e0abee repost ordered qty 2012-12-05 15:51:05 +05:30
Rushabh Mehta
071dc7f164 added patch for expense and leave 2012-12-05 15:45:48 +05:30
Rushabh Mehta
39c356393b refactored leave and expense 2012-12-05 14:27:50 +05:30
Nabin Hait
e2639197de deprecate tds patch 2012-12-05 10:18:49 +05:30
Nabin Hait
b24e783aef deprecated tds 2012-12-04 18:58:15 +05:30
Anand Doshi
9356ac7ef5 sync communication before patch 2012-12-03 17:35:17 +05:30
Nabin Hait
4bbaddd57d Merge branch 'master' of github.com:webnotes/erpnext 2012-12-01 16:33:35 +05:30
Anand Doshi
2f1ede1a5f changed communication module to core in patch 2012-11-30 20:39:55 +05:30
Nabin Hait
0d2fddbc06 Patch for fixing floating point issue in gl entry 2012-11-30 19:40:52 +05:30
Nabin Hait
995b5c617b Patch for fixing floating point issue in gl entry 2012-11-30 19:40:37 +05:30
Anand Doshi
0fd99e7536 removed unnecessary imports 2012-11-30 16:38:04 +05:30
Anand Doshi
746e229026 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-30 15:15:16 +05:30
Nabin Hait
3e0612db83 fixed conflict 2012-11-30 15:02:20 +05:30
Nabin Hait
9d4e5569c8 Patch for production fieldlevel changes 2012-11-30 14:37:17 +05:30
Rushabh Mehta
71d6a0ce1d cleaned up leave application 2012-11-30 12:41:46 +05:30
Rushabh Mehta
86adcaa113 fixed employee permissions, fixed bug in import_merge of timestamps 2012-11-30 12:02:00 +05:30
Rushabh Mehta
d7fe2bfe1b webnotes.model.doctype (new version) 2012-11-29 11:49:56 +05:30
Nabin Hait
0af1959a63 remove basic info patch not required 2012-11-28 16:56:50 +05:30
Nabin Hait
c4fb30dc8d Removed basic info section 2012-11-28 16:49:18 +05:30
Rushabh Mehta
af45422668 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2012-11-28 15:28:04 +05:30
Nabin Hait
ee48ef747c Merge branch 'master' of github.com:webnotes/erpnext 2012-11-28 15:26:33 +05:30
Nabin Hait
1da6e1b864 patch: update % delievered and % billed in SO if pos made against that so 2012-11-28 15:24:11 +05:30
Rushabh Mehta
40d73ed9db profile: form is now my settings page, removed (Page, profile-settings) 2012-11-28 15:21:04 +05:30
Rushabh Mehta
bd919caa9b profile: form is now my settings page, removed (Page, profile-settings) 2012-11-28 15:19:51 +05:30
Nabin Hait
dcc4ff5ca3 patch: update % delievered and % billed in SO if pos made against that so 2012-11-28 14:12:49 +05:30
Nabin Hait
d9eb526b27 patch: update % delievered and % billed in SO if pos made against that so 2012-11-28 12:40:52 +05:30
Anand Doshi
55ffa7e14d Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	patches/patch_list.py
2012-11-27 18:56:32 +05:30
Anand Doshi
a22bd841eb patch to update cancelled BOMs 2012-11-27 18:55:17 +05:30
Rushabh Mehta
1a0c61711c refactored communication and added to Lead / Contact 2012-11-27 18:48:43 +05:30
Rushabh Mehta
33c8d0d3e2 refactored communication and added to Lead / Contact 2012-11-27 18:45:21 +05:30
Rushabh Mehta
e1a433812f refactored communication and added to Lead / Contact 2012-11-27 18:41:42 +05:30
Rushabh Mehta
80127bfb6a refactored communication and added to Lead / Contact 2012-11-27 18:41:35 +05:30
Rushabh Mehta
21df1479a7 reload_doc can now do doctypes, update patch 2012-11-26 15:18:36 +05:30
Rushabh Mehta
bf09c672cd support ticket response deprecated, moved to communication 2012-11-24 15:26:48 +05:30
Anand Doshi
b5dcaecc37 fix in remove old unbilled items report 2012-11-23 18:14:57 +05:30
Rushabh Mehta
7d665818b5 moved delivered_items_to_be_billed from stock to accounts 2012-11-23 17:56:30 +05:30
Rushabh Mehta
78d4b49e62 introducing model 3.0, refactored import module 2012-11-23 17:53:43 +05:30
Anand Doshi
01f689bfe5 change cancelled profiles to disabled and show in profile list 2012-11-22 19:22:38 +05:30
Rushabh Mehta
45fd518ed0 fix appraisal patch for rerun 2012-11-17 14:31:06 +05:30
Rushabh Mehta
04b9579b24 appraisal cleanup, removed un-necessary logic 2012-11-16 10:37:14 +05:30
Rushabh Mehta
84b638f49a fix to customer issue, desktop 2012-11-15 16:58:36 +05:30
Rushabh Mehta
86945fe178 fix to customer issue, desktop 2012-11-15 16:58:27 +05:30
Rushabh Mehta
85df835db2 hotfix for desktop icon + updates to assign to and patch 2012-11-15 16:36:42 +05:30
Rushabh Mehta
2a44bf8245 customer_issue: moved allocated to assigned 2012-11-15 15:11:15 +05:30