Commit Graph

36 Commits

Author SHA1 Message Date
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
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
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
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
Nabin Hait
e2639197de deprecate tds patch 2012-12-05 10:18:49 +05:30