Anand Doshi
|
aacbe7a277
|
Merge branches '1310' and 'master' of github.com:webnotes/erpnext
|
2013-11-07 21:04:36 +05:30 |
|
Anand Doshi
|
3990104e9b
|
[minor] [refactor] Accounts Receivable
|
2013-11-07 21:04:01 +05:30 |
|
Anand Doshi
|
ed1679a1c5
|
Merge branch '1310' of github.com:webnotes/erpnext
|
2013-11-07 20:49:13 +05:30 |
|
Anand Doshi
|
9ff22fd508
|
[minor] [refactor] Accounts Receivable
|
2013-11-07 20:44:30 +05:30 |
|
Anand Doshi
|
620b229c03
|
Merge pull request #1023 from fogueri/master
[docs] [minor] sales return
|
2013-11-07 04:14:28 -08:00 |
|
Priya
|
eb0ea44f2c
|
[docs] minor sales return
|
2013-11-07 17:24:51 +05:30 |
|
Anand Doshi
|
427935f2a6
|
[minor] [fix] demo timezone
|
2013-11-07 15:53:09 +05:30 |
|
Anand Doshi
|
65e9a4dd2b
|
Merge pull request #1021 from fogueri/master
[docs] minor mrp and website
|
2013-11-06 22:57:54 -08:00 |
|
Priya
|
092e3bb58d
|
Merge branch 'master' of github.com:fogueri/erpnext
|
2013-11-07 12:21:30 +05:30 |
|
Priya
|
6b3358a172
|
[docs] minor mrp and website
|
2013-11-07 12:20:08 +05:30 |
|
Anand Doshi
|
d173379ca7
|
Merge pull request #1019 from akhileshdarjee/1310
[fix] [minor] fixed landed cost wizard for cancel_pr()
|
2013-11-06 04:00:58 -08:00 |
|
Akhilesh Darjee
|
e3af1eaf47
|
[fix] fixed landed cost wizard for cancel_pr()
|
2013-11-06 16:59:38 +05:30 |
|
Anand Doshi
|
fb4530ce4e
|
Merge pull request #1017 from akhileshdarjee/1310
[fix] [minor] added owner permission for lead details query report
|
2013-11-06 02:36:04 -08:00 |
|
Akhilesh Darjee
|
04f65a0c56
|
[fix] added owner permission for query report
|
2013-11-06 15:45:26 +05:30 |
|
Anand Doshi
|
8728f26442
|
Refactored plugin architecture to allow custom script reports
|
2013-11-06 14:19:09 +05:30 |
|
Anand Doshi
|
3bed5abc76
|
[minor] demo login fix
|
2013-11-05 20:05:52 +05:30 |
|
Anand Doshi
|
8bc3c16497
|
[minor] fix in general ledger after translation merge
|
2013-11-05 20:05:39 +05:30 |
|
Anand Doshi
|
1788c8b4d0
|
Merge branch '1310' of github.com:webnotes/erpnext
|
2013-11-05 12:10:08 +05:30 |
|
Anand Doshi
|
22c0d78ef4
|
[minor] [fix] added end of life condition in item query
|
2013-11-04 16:23:04 +05:30 |
|
Anand Doshi
|
4a84b039df
|
Merge branch '1310' of github.com:webnotes/erpnext
|
2013-11-04 15:34:54 +05:30 |
|
Anand Doshi
|
d47db9bccf
|
Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
patches/october_2013/p07_rename_for_territory.py
patches/october_2013/p08_cleanup_after_item_price_module_change.py
setup/doctype/setup_control/setup_control.py
utilities/demo/demo_docs/Lead.csv
|
2013-11-04 15:34:10 +05:30 |
|
Anand Doshi
|
a3a348fc10
|
[minor] fix in patch
|
2013-11-04 15:33:39 +05:30 |
|
Anand Doshi
|
4bfaaf33aa
|
[minor] fix in patch
|
2013-11-04 15:31:00 +05:30 |
|
Anand Doshi
|
b03f870441
|
Merge branch '1310' of github.com:webnotes/erpnext
|
2013-11-04 15:22:50 +05:30 |
|
Anand Doshi
|
3673a25176
|
[minor] fixes after item price move
|
2013-11-04 15:14:57 +05:30 |
|
Anand Doshi
|
2ced381976
|
[minor] fixes in test cases and demo
|
2013-11-04 14:37:29 +05:30 |
|
Anand Doshi
|
daaa14c079
|
Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
setup/doctype/setup_control/setup_control.py
stock/doctype/stock_entry/stock_entry.py
utilities/demo/demo_docs/Price_List.csv
|
2013-11-04 13:14:39 +05:30 |
|
Anand Doshi
|
06757a19ef
|
[minor] [query] expense and income account queries should exclude customer and supplier accounts
|
2013-11-04 12:55:24 +05:30 |
|
Nabin Hait
|
4144b1c841
|
[fix] [minor] itemwise sales/purchase register
|
2013-11-01 18:08:55 +05:30 |
|
Nabin Hait
|
75a4206a24
|
Merge pull request #1009 from akhileshdarjee/1310
[cleanup] moved for territory, price list and item price doctype from setup to stock
|
2013-10-31 23:05:16 -07:00 |
|
Akhilesh Darjee
|
9c1488a7c0
|
[cleanup] [minor] for territory fixed to applicable territory
|
2013-10-31 19:56:31 +05:30 |
|
Akhilesh Darjee
|
e158cea77a
|
[cleanup] [minor] replaced for territory to applicable territory
|
2013-10-31 19:50:51 +05:30 |
|
Anand Doshi
|
cb72e01e9d
|
[minor] email footer link points to erpnext.org
|
2013-10-31 19:07:05 +05:30 |
|
Anand Doshi
|
b950a71fb2
|
[minor] [fix] sales funnel
|
2013-10-31 19:07:05 +05:30 |
|
Anand Doshi
|
7944ea3067
|
[minor] [fix] plugin patch
|
2013-10-31 19:07:05 +05:30 |
|
Akhilesh Darjee
|
a604acb5c9
|
Merge branch '1310' of github.com:webnotes/erpnext into 1310
|
2013-10-31 12:41:10 +05:30 |
|
Akhilesh Darjee
|
0b39e95011
|
[cleanup] moved for territory, price list and item price doctype from setup to stock
|
2013-10-31 12:35:52 +05:30 |
|
Priya
|
44a7c57960
|
[docs] minor mrp and website
|
2013-10-31 12:26:12 +05:30 |
|
Nabin Hait
|
93ba6f7e0e
|
[fix] [minor] update outstanding amount
|
2013-10-31 11:47:45 +05:30 |
|
Pratik Vyas
|
f64dfa1d46
|
[minor] removed checking out of wsgi after clone in install script, booboo
|
2013-10-31 11:43:51 +05:30 |
|
Pratik Vyas
|
4ec768b86c
|
fix ubuntu install
|
2013-10-28 21:58:36 +05:30 |
|
Anand Doshi
|
fec52b5a8f
|
[minor] fixed stock entry and demo
|
2013-10-28 19:59:45 +05:30 |
|
Nabin Hait
|
494a216193
|
[fix] [minor] Cost center is mandatory if tax is include din valuation and perpetual inventory enabled
|
2013-10-28 19:59:45 +05:30 |
|
Nabin Hait
|
392596cb91
|
[fix] [minor] account group balance in grid report
|
2013-10-28 19:59:44 +05:30 |
|
Nabin Hait
|
dc89acaf05
|
[fix] [minor] fetch item and price list details on saving item price
|
2013-10-28 19:59:44 +05:30 |
|
Nabin Hait
|
ed3dc56da4
|
[minor] Ignore permission while updating profile from employee
|
2013-10-28 19:59:44 +05:30 |
|
Nabin Hait
|
a5bd3dd207
|
[fix] [minor] update finished goods against production order
|
2013-10-28 19:59:43 +05:30 |
|
Pratik Vyas
|
de4b720912
|
remove changing of memcached user in install_erpnext.py
|
2013-10-28 18:43:34 +05:30 |
|
Nabin Hait
|
9304396e17
|
[fix] [minor] Cost center is mandatory if tax is include din valuation and perpetual inventory enabled
|
2013-10-28 15:33:36 +05:30 |
|
Pratik Vyas
|
f4081c8130
|
remove changing of memcached user in install_erpnext.py
|
2013-10-28 14:43:00 +05:30 |
|