Nabin Hait
|
f33831abe4
|
Merge branch 'master' into production
|
2012-12-20 14:31:26 +05:30 |
|
Nabin Hait
|
457b0b8648
|
fixes in sales/purchase register
|
2012-12-20 14:29:53 +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 |
|
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
|
5f175dfd00
|
Merge branch 'master' into production
|
2012-12-18 13:49:07 +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
|
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
|
fce76cd5b2
|
Merge branch 'master' of github.com:webnotes/erpnext into production
|
2012-12-14 13:21:52 +05:30 |
|
Nabin Hait
|
f8de5b9878
|
merged with master
|
2012-12-14 10:43:56 +05:30 |
|
Rushabh Mehta
|
a59aa68eac
|
added new reports
|
2012-12-14 10:27:10 +05:30 |
|
Nabin Hait
|
22c3f63edd
|
small fixes: sms, quotation messages etc
|
2012-12-13 15:09:42 +05:30 |
|
Rushabh Mehta
|
e848e9c4c3
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-13 13:14:22 +05:30 |
|
Rushabh Mehta
|
291449b6fb
|
refactored javascript models
|
2012-12-13 12:53:21 +05:30 |
|
Nabin Hait
|
561be839c5
|
voucher import tool message
|
2012-12-12 16:35:31 +05:30 |
|
Nabin Hait
|
003b31ae06
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-12 16:27:22 +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 |
|
Rushabh Mehta
|
d1b2afcd18
|
webnotes.user.roles deprecated to webnotes.user.get_roles()
|
2012-12-12 15:58:46 +05:30 |
|
Nabin Hait
|
be356b8692
|
Merge branch 'master' of github.com:webnotes/erpnext into production
|
2012-12-12 12:58:22 +05:30 |
|
Rushabh Mehta
|
74aebf0965
|
added Communication to Selling and refactored module pages a bit
|
2012-12-12 11:03:51 +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 |
|
Rushabh Mehta
|
a494b88ad8
|
updates to website: removed webnotes.cms
|
2012-12-07 12:44:45 +05:30 |
|
Nabin Hait
|
f71d8e0ee4
|
debit/credit adjustment if there is difference due to rounding
|
2012-12-06 17:24:59 +05:30 |
|
Anand Doshi
|
bd8ef60929
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-06 15:15:18 +05:30 |
|
Anand Doshi
|
85e44b4247
|
fix in voucher import tool
|
2012-12-06 15:14:51 +05:30 |
|
Rushabh Mehta
|
89c7b41fee
|
account_browser: remove can_create check
|
2012-12-06 14:58:44 +05:30 |
|
Rushabh Mehta
|
06d24a60d0
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-06 12:19:33 +05:30 |
|
Rushabh Mehta
|
b536d36771
|
more refactoring to renaming
|
2012-12-06 12:19:05 +05:30 |
|
Rushabh Mehta
|
76c4f61ffb
|
more refactoring to renaming
|
2012-12-06 12:09:52 +05:30 |
|
Nabin Hait
|
27184e0e05
|
default filters set in debtors and creditors ledger
|
2012-12-06 11:46:41 +05:30 |
|
Rushabh Mehta
|
a112981ca2
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-12-05 14:34:51 +05:30 |
|
Rushabh Mehta
|
39c356393b
|
refactored leave and expense
|
2012-12-05 14:27:50 +05:30 |
|
Nabin Hait
|
1ad42f09df
|
bom fixes: item selection before server call
|
2012-12-05 12:36:19 +05:30 |
|
Nabin Hait
|
b24e783aef
|
deprecated tds
|
2012-12-04 18:58:15 +05:30 |
|
Rushabh Mehta
|
535d6c4d91
|
added client side functions and mode_of_payment defaults
|
2012-12-04 16:34:26 +05:30 |
|