Commit Graph

4324 Commits

Author SHA1 Message Date
Anand Doshi
1107d50a59 reload stock entry before running custom fields patch 2012-12-20 12:42:16 +05:30
Anand Doshi
def65c671d show manufacturing small icon 2012-12-20 12:18:24 +05:30
Rushabh Mehta
608a751b57 import merge, task list label 2012-12-20 11:08:11 +05:30
Rushabh Mehta
be7fe472b6 import merge, remove Core 2012-12-20 11:01:09 +05:30
Rushabh Mehta
5569321d15 fixed z-index and renamed all-app.js to all-app.min.js 2012-12-20 10:37:37 +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
Nabin Hait
6435437e5b updates in manufacturing module 2012-12-19 19:33:41 +05:30
Rushabh Mehta
1ba4bd4485 added webclient.py and some misc fixes 2012-12-19 17:05:51 +05:30
Rushabh Mehta
8ebf1b86f8 added disabled in Report and no_sync fields in import_merge 2012-12-19 15:34:00 +05:30
Rushabh Mehta
15430f87ca Merge branch 'master' of github.com:webnotes/erpnext 2012-12-19 12:46:41 +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
4ecc785aab fixed conflict 2012-12-19 12:18:15 +05:30
Anand Doshi
ab28978755 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-19 12:02:46 +05:30
Anand Doshi
f1854b1c2f removed discount from print hide in purchase cycle 2012-12-19 12:01:48 +05:30
Nabin Hait
bb852e45e9 fixes in ordered/delivered items to be billed 2012-12-19 11:55:42 +05:30
Nabin Hait
64a839a747 fixes in ordered/delivered items to be billed 2012-12-19 11:43:28 +05:30
Nabin Hait
08196f59ec Merge branch 'master' of github.com:webnotes/erpnext 2012-12-19 10:35:40 +05:30
Nabin Hait
b6166caec7 modified timestamp 2012-12-19 10:35:09 +05:30
Rushabh Mehta
60ec6ba975 web: navbar-inverse 2012-12-19 10:16:58 +05:30
Rushabh Mehta
e109fa4fb8 website updates and fix to sessions 2012-12-19 10:14:59 +05:30
Nabin Hait
1a6a94b760 stock entry cleanup 2012-12-18 18:42:02 +05:30
Nabin Hait
fff3eb4142 Update production/doctype/bom/bom.py
set is_default in current BOM when updating after submit
2012-12-18 14:57:49 +05:30
Rushabh Mehta
647e0d1164 updates to product_page (search) and kb fix 2012-12-18 14:47:54 +05:30
Nabin Hait
5f175dfd00 Merge branch 'master' into production 2012-12-18 13:49:07 +05:30
Nabin Hait
92af22aa12 removed debug mode 2012-12-18 13:45:59 +05:30
Rushabh Mehta
7adf17e95d Merge branch 'master' of github.com:webnotes/erpnext 2012-12-18 11:47:46 +05:30
Rushabh Mehta
ee472b0926 upgraded to bootstrap 2.2 2012-12-18 11:47:13 +05:30
Nabin Hait
5c2bb9d9ed sales order linked with project 2012-12-18 10:44:01 +05:30
Nabin Hait
8b42531eba Merge branch 'master' of github.com:webnotes/erpnext 2012-12-18 10:33:38 +05:30
Nabin Hait
e93150bf26 sales order linked with project 2012-12-18 10:33:04 +05:30
Nabin Hait
bf52eb08a6 stock entry cleanup patch 2012-12-18 10:29:06 +05:30
Nabin Hait
7c59c68434 stock entry cleanp 2012-12-18 10:28:36 +05:30
Anand Doshi
56359f06f6 patch to clear web cache 2012-12-17 16:14:26 +05:30
Rushabh Mehta
a93ba77918 added item specification, bugfix for form grid 2012-12-17 16:02:04 +05:30
Rushabh Mehta
0e9e848cfc added item specification, bugfix for form grid 2012-12-17 16:00:34 +05:30
Anand Doshi
834adfab60 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-17 14:13:59 +05:30
Anand Doshi
1b8918a192 do not copy uom details in item 2012-12-17 14:12:47 +05:30
Rushabh Mehta
cdcd15d9e2 added font-awesome 2012-12-17 13:30:51 +05:30
Rushabh Mehta
6fa388c3d4 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-17 12:53:20 +05:30
Rushabh Mehta
fd6ad19fa0 refactored blog client-side code 2012-12-17 12:52:43 +05:30
Anand Doshi
09f799bc98 show message on removing attachment used in description html 2012-12-17 12:12:01 +05:30
Nabin Hait
9ea22b75bd Merge branch 'master' into production 2012-12-17 11:39:41 +05:30
Nabin Hait
49415d90fc create recurring invoices on any date 2012-12-17 11:09:08 +05:30
Nabin Hait
3af7b981fa Merge branch 'master' of github.com:webnotes/erpnext 2012-12-17 10:50:13 +05:30
Nabin Hait
506f7a3f7b fixed null issue in recurring invoice 2012-12-17 10:49:20 +05:30
Nabin Hait
0a8a67129e fixed null issue in recurring invoice 2012-12-17 10:48:04 +05:30
Rushabh Mehta
60f47b3648 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-17 10:28:37 +05:30
Anand Doshi
5f17be8364 added payment link in expiry banner 2012-12-15 18:38:18 +05:30
webnotes
ff4e996a8f fixed syntax error in recurring sales invoice code 2012-12-15 17:51:24 +05:30
Nabin Hait
5ca0f44890 bom cleanup 2012-12-14 19:00:42 +05:30