Commit Graph

198 Commits

Author SHA1 Message Date
Anand Doshi
35af9ba4e6 Merge branch 'master' into edge 2013-01-18 14:50:25 +05:30
Anand Doshi
a81370f2a3 added description to Price List field. added in latest updates 2013-01-18 13:26:54 +05:30
Nabin Hait
b9b1e67c7d made c-form submittable 2013-01-18 12:58:21 +05:30
Anand Doshi
ef02ddfc40 Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list
Conflicts:
	accounts/doctype/gl_control/gl_control.py
2013-01-17 20:31:41 +05:30
Anand Doshi
8957bf9e09 print hide price list related fields 2013-01-17 20:29:28 +05:30
Anand Doshi
f8f0c0d089 updates in purchase cycle's price list 2013-01-17 20:20:56 +05:30
Nabin Hait
16546d25e7 gl control cleanup[ 2013-01-17 18:43:54 +05:30
Nabin Hait
274de5462b Merge branch 'master' of github.com:webnotes/erpnext 2013-01-17 18:27:20 +05:30
Nabin Hait
1efaf841c4 payment reconciliation fixes 2013-01-17 18:26:58 +05:30
Rushabh Mehta
8af47e8413 Merge branch 'edge' 2013-01-17 18:24:09 +05:30
Rushabh Mehta
db7139a649 started fresh install and added country_info 2013-01-17 18:22:22 +05:30
Nabin Hait
a81010a5b3 removed debug mode 2013-01-17 17:25:55 +05:30
Nabin Hait
144ba186d3 fixes in c-form 2013-01-17 17:21:29 +05:30
Nabin Hait
1b4f56c57f fixes in c-form 2013-01-17 17:01:51 +05:30
Anand Doshi
9d9aec1ed4 shifted get_company_currency from transaction base to setup/utils.py 2013-01-17 15:44:57 +05:30
Anand Doshi
756dca719b refactored purchase cycle's get item details and update item details functions and started with purchase price list 2013-01-15 18:39:21 +05:30
Rushabh Mehta
1233c4a800 financial statements: show only companies where permission is given 2013-01-11 11:00:20 +05:30
Rushabh Mehta
846678a1e4 added links to open count in module + other minor fixes 2013-01-10 12:25:25 +05:30
Nabin Hait
f8c6531c3d set as default button in fiscal year 2013-01-09 14:44:24 +05:30
Nabin Hait
dc8913e132 toggle display of contact info based on customer and conatct, address query based on customer 2013-01-09 12:35:24 +05:30
Anand Doshi
e9418f3be1 fix in syntax when using erpnext.queries.item 2013-01-08 17:00:02 +05:30
Rushabh Mehta
143ea718c3 commified item_code query 2013-01-07 17:03:11 +05:30
Rushabh Mehta
523aec499a bootstrapped language and added 'hi' 2013-01-07 15:39:54 +05:30
Anand Doshi
62299260dc shifted UOM field to after qty field in purchase cycle 2013-01-04 13:16:34 +05:30
Rushabh Mehta
d4872483e4 fixes to permission manager / user property setter 2013-01-02 15:29:37 +05:30
Rushabh Mehta
e2c7e583f5 updated usability of payment_to_invoice_matching tool and fixed hide_toolbar 2012-12-31 10:51:31 +05:30
Anand Doshi
b420e88955 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-27 15:36:30 +05:30
Anand Doshi
b62c4edf02 added is_item_table_empty validation in submit event of purchase common 2012-12-27 15:35:58 +05:30
Nabin Hait
562de92070 removed project related doctype mapper 2012-12-27 15:14:27 +05:30
Anand Doshi
f5d90abe92 addchild will never save added doc 2012-12-24 17:02:38 +05:30
Anand Doshi
def65c671d show manufacturing small icon 2012-12-20 12:18:24 +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
Anand Doshi
f1854b1c2f removed discount from print hide in purchase cycle 2012-12-19 12:01:48 +05:30
Nabin Hait
5f175dfd00 Merge branch 'master' into production 2012-12-18 13:49:07 +05:30
Nabin Hait
5c2bb9d9ed sales order linked with project 2012-12-18 10:44: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
webnotes
ff4e996a8f fixed syntax error in recurring sales invoice code 2012-12-15 17:51:24 +05:30
Nabin Hait
f8de5b9878 merged with master 2012-12-14 10:43:56 +05:30
Nabin Hait
22c3f63edd small fixes: sms, quotation messages etc 2012-12-13 15:09:42 +05:30
Rushabh Mehta
291449b6fb refactored javascript models 2012-12-13 12:53:21 +05:30
Nabin Hait
06cbd3427f dynamic query for root in sales browser, validation for tree structure document 2012-12-12 16:26:39 +05:30
Anand Doshi
c3b9a00c53 changed old type txt to new type txtt 2012-12-11 15:20:53 +05:30
Nabin Hait
69b3730a18 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-11 14:36:19 +05:30
Nabin Hait
cddbe6dd80 validation while created through company saving and root deleted 2012-12-11 14:35:45 +05:30
Anand Doshi
36bf910563 removed Standard from default print format 2012-12-11 14:01:59 +05:30
Rushabh Mehta
af63b16be8 f 2012-12-10 13:41:10 +05:30