Anand Doshi
|
ecc28f0311
|
[sales invoice] [update stock] allow update stock in sales invoice, without it being a pos invoice
|
2013-05-30 17:43:30 +05:30 |
|
Anand Doshi
|
200c8f7980
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.py
selling/doctype/sales_common/sales_common.py
|
2013-05-29 12:30:54 +05:30 |
|
Anand Doshi
|
a3773396f3
|
[naming series] [fix] added Date in make autoname
|
2013-05-29 11:41:13 +05:30 |
|
Anand Doshi
|
4543884021
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
accounts/doctype/sales_invoice_item/sales_invoice_item.txt
selling/doctype/quotation/quotation.txt
selling/doctype/quotation_item/quotation_item.txt
selling/doctype/sales_order_item/sales_order_item.txt
stock/doctype/delivery_note_item/delivery_note_item.txt
stock/doctype/item/item.txt
|
2013-05-23 15:22:47 +05:30 |
|
Nabin Hait
|
62d0629d61
|
[feature] reorder level checking through scheduler
|
2013-05-22 16:19:10 +05:30 |
|
Anand Doshi
|
dcfb4b7ab9
|
[website] [fix] explicitly pass meta description
|
2013-05-22 12:14:31 +05:30 |
|
Anand Doshi
|
5be11b44ac
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
controllers/buying_controller.py
|
2013-05-21 19:40:09 +05:30 |
|
Nabin Hait
|
a35466b008
|
[price list] on deletion of price list, delete all item price record for the same price list
|
2013-05-20 18:32:06 +05:30 |
|
Anand Doshi
|
0eef6e9e42
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
patches/patch_list.py
|
2013-05-15 21:18:27 +05:30 |
|
Anand Doshi
|
1dde46aff0
|
[buying, selling] [refactor] get item details
|
2013-05-15 21:15:57 +05:30 |
|
Anand Doshi
|
bfc18ea6c4
|
[setup home] combined Update Application, Backup Manager and Scheduler Error Log under Setup > Administration
|
2013-05-15 12:24:50 +05:30 |
|
Anand Doshi
|
21b854b7cc
|
[rename] [fix] merge related fixes
|
2013-05-09 13:21:13 +05:30 |
|
Anand Doshi
|
bddd5d9b0c
|
[rename] [fix] merge should be passed to on_rename method of controller for further processing
|
2013-05-09 12:45:18 +05:30 |
|
Anand Doshi
|
d2b8b83e20
|
[sales invoice] [fetching] fetch customer info, pos settings and item details if not fetched
|
2013-05-03 13:22:41 +05:30 |
|
Anand Doshi
|
eb41ffd24e
|
[buying controller] [fix] fixed message for company warehouse mismatch validation
|
2013-05-02 18:10:19 +05:30 |
|
Anand Doshi
|
ff1e155a77
|
[price list] country-wise price list
|
2013-05-02 16:25:59 +05:30 |
|
Anand Doshi
|
9d504e4706
|
Merge branch 'price_list_country'
Conflicts:
home/page/latest_updates/latest_updates.js
setup/doctype/price_list/price_list.txt
|
2013-05-02 16:25:46 +05:30 |
|
Rushabh Mehta
|
99181fa772
|
Merge branch 'fixes'
|
2013-05-02 15:37:49 +05:30 |
|
Rushabh Mehta
|
f5f478ee78
|
[item] [naming] by series or code / [naming series] optionally set number of digits
|
2013-05-02 15:36:33 +05:30 |
|
Anand Doshi
|
2fa4815080
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-05-02 14:51:19 +05:30 |
|
Rushabh Mehta
|
3487e0a0f3
|
[price list] added currency property, validates currency, duplication in Item Price
|
2013-05-02 14:46:12 +05:30 |
|
Anand Doshi
|
76b3fcdb45
|
[backup manager] [fix] hide google drive settings and show proper intro messages
|
2013-05-02 14:14:38 +05:30 |
|
Anand Doshi
|
e97b07e43f
|
[backup manager] [fix] manage mysql connection
|
2013-05-01 14:12:19 +05:30 |
|
Anand Doshi
|
d7ad13a8a7
|
[price list] [country] specify country for a price list
|
2013-04-29 19:38:34 +05:30 |
|
Anand Doshi
|
ded4848a5e
|
Merge branch 'master' into edge
|
2013-04-24 15:35:38 +05:30 |
|
Anand Doshi
|
77bb4cef39
|
[naming series] [fixes] consider custom fields with fieldname naming_series
|
2013-04-24 15:32:39 +05:30 |
|
Anand Doshi
|
deb31432dd
|
Merge branch 'master' into edge
|
2013-04-23 17:08:34 +05:30 |
|
Anand Doshi
|
10f09092aa
|
[backup manager] [fixes] show erroneous files in error email message
|
2013-04-23 17:07:52 +05:30 |
|
Anand Doshi
|
3e8c696de7
|
Merge branch 'master' into edge
|
2013-04-23 14:24:00 +05:30 |
|
Anand Doshi
|
ed7cf1bced
|
[backup manager] [fixes] fixes in dropbox and google drive
|
2013-04-23 14:23:03 +05:30 |
|
Anand Doshi
|
a536eef393
|
Merge branch 'master' into edge
|
2013-04-23 13:10:55 +05:30 |
|
Anand Doshi
|
76d7ec51fb
|
[backup manager] [fixes] fix in dropbox folder path
|
2013-04-23 13:05:40 +05:30 |
|
Anand Doshi
|
dc0f2d2422
|
Merge branch 'master' into edge
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
stock/doctype/item/item.txt
|
2013-04-23 12:42:18 +05:30 |
|
Anand Doshi
|
890265928b
|
[backup manager] [error handling] on error, send complete traceback as email
|
2013-04-23 12:30:38 +05:30 |
|
Rushabh Mehta
|
4c3419bee0
|
Merge branch 'master' into edge
|
2013-04-22 14:03:31 +05:30 |
|
Anand Doshi
|
5717fe3aba
|
[cost center] [default value] default cost center for each company, auto set default cost center for various transactions during creation
|
2013-04-17 18:02:52 +05:30 |
|
Anand Doshi
|
2b349d38d9
|
Merge branch 'master' into edge
|
2013-04-17 15:10:47 +05:30 |
|
Anand Doshi
|
d484b380ad
|
[email digest] [sender] sender should be the automail id specified in Email Settings
|
2013-04-17 15:10:08 +05:30 |
|
Anand Doshi
|
e776742f5d
|
[company] [cleanup] on_rename method
|
2013-04-17 13:19:35 +05:30 |
|
Rushabh Mehta
|
0c1611219e
|
[files] [cleanup/redesign] removed the old file_list structure and also added file listing in setup
|
2013-04-10 13:54:13 +05:30 |
|
Rushabh Mehta
|
33075e1f69
|
[files] [patch] dropped file_list property and moved links to
|
2013-04-10 11:08:50 +05:30 |
|
Nabin Hait
|
2b61f6142a
|
fixed conflict
|
2013-04-08 12:44:57 +05:30 |
|
Nabin Hait
|
a477d41843
|
[aii] some fixes
|
2013-04-08 12:39:11 +05:30 |
|
Rushabh Mehta
|
cfa663e337
|
[message] [fix] rewire to core
|
2013-04-04 10:02:08 +05:30 |
|
Rushabh Mehta
|
d8cf1d74ba
|
Merge branch 'master' into edge
|
2013-04-03 16:39:02 +05:30 |
|
Rushabh Mehta
|
27c4079ff9
|
[framework] [cleanup] desktop, todo, messages, modules setup moved to framework
|
2013-04-03 15:21:44 +05:30 |
|
Rushabh Mehta
|
5c12765313
|
[merge]
|
2013-04-02 10:51:11 +05:30 |
|
Rushabh Mehta
|
9db1a68d89
|
[website] [cleanup] moved website generic utils to framework
|
2013-04-02 10:41:37 +05:30 |
|
Anand Doshi
|
bdedd555ca
|
[setup] [update manager] renamed update-this-app page to update-manager
|
2013-04-01 16:51:33 +05:30 |
|
Anand Doshi
|
72b28807d2
|
[setup] [feature] Update Manager for self hosted applications based on wnframework
|
2013-04-01 16:40:19 +05:30 |
|