Rushabh Mehta
|
e6af313bfa
|
[icons] added icons to forms, toolbars, moduleview, doclistview, reportview
|
2013-07-05 16:25:17 +05:30 |
|
Rushabh Mehta
|
3a3c2710d1
|
[icon] added in doctype
|
2013-07-05 15:13:31 +05:30 |
|
Rushabh Mehta
|
8005362c6c
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
|
2013-07-05 10:51:51 +05:30 |
|
Rushabh Mehta
|
e953f0bb97
|
[form cleanup] journal voucher, purchase invoice, sales invoice, delivery note, item, purchase receipt
|
2013-07-05 10:48:35 +05:30 |
|
Nabin Hait
|
bc9cf1549f
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-07-04 17:56:51 +05:30 |
|
Rushabh Mehta
|
be2016ba41
|
[mapper] sales order-sales invoice added condition
|
2013-07-04 17:52:03 +05:30 |
|
Rushabh Mehta
|
8fe97fcbe1
|
[mapper] sales order-sales invoice
|
2013-07-04 17:31:06 +05:30 |
|
Nabin Hait
|
9010f92eab
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-07-04 16:03:24 +05:30 |
|
Rushabh Mehta
|
8aded138c7
|
[buying] started cleanup, [mapper] started rewrite
|
2013-07-04 12:50:52 +05:30 |
|
Rushabh Mehta
|
bcff7dce8e
|
[cleanup] [stock entry] [sales order]
|
2013-07-03 18:32:29 +05:30 |
|
Nabin Hait
|
71c3f95098
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-07-01 18:28:26 +05:30 |
|
Nabin Hait
|
fdbfe1c274
|
Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive
|
2013-07-01 12:20:19 +05:30 |
|
Nabin Hait
|
b5e58ffa26
|
[rename with merge] updated on_rename function for item, warehouse, al tree type documents
|
2013-07-01 12:20:00 +05:30 |
|
Rushabh Mehta
|
1bcc19e019
|
[item] default warehouse is selected with item
|
2013-07-01 11:46:07 +05:30 |
|
Rushabh Mehta
|
e6d986adea
|
[import] fixes
|
2013-06-27 10:54:49 +05:30 |
|
Rushabh Mehta
|
65d12926fd
|
[setup] bug fixes
|
2013-06-26 22:31:22 +05:30 |
|
Anand Doshi
|
e81321219e
|
[webshop] [cart] add to cart, remove_from_cart, update qty, checkout methods
|
2013-06-17 15:42:38 +05:30 |
|
Rushabh Mehta
|
64c2764b56
|
[translations/build] deleted translation files (to be built on demand)
|
2013-06-17 11:56:41 +05:30 |
|
Anand Doshi
|
abc100302c
|
[cart] create quotation on checkout
|
2013-06-14 17:44:03 +05:30 |
|
Anand Doshi
|
060d9248d3
|
[fixes] buying/selling price lists, communication and website settings
|
2013-06-12 17:40:36 +05:30 |
|
Rushabh Mehta
|
cd4bfa6b9a
|
[docs] added for stock module
|
2013-06-11 12:04:01 +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
|
aab81626ce
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
stock/doctype/item/item.txt
|
2013-05-10 18:12:24 +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
|
4f8a81ca97
|
[item] [usability] change image view on change of image
|
2013-05-08 17:40:35 +05:30 |
|
Anand Doshi
|
75eeb01052
|
[attachments] [fix] on adding and removing attachments, update the select fields with options attach_files:
|
2013-05-08 12:35:33 +05:30 |
|
Nabin Hait
|
04f888fa52
|
[fixes] item_code non-mandatory in item if naming_series
|
2013-05-07 16:03:10 +05:30 |
|
Anand Doshi
|
3f9366bb6c
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
stock/doctype/item/item.txt
|
2013-05-06 12:07:30 +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 |
|
Rushabh Mehta
|
3487e0a0f3
|
[price list] added currency property, validates currency, duplication in Item Price
|
2013-05-02 14:46:12 +05:30 |
|
Rushabh Mehta
|
c711598940
|
[doclist] new pattern / [item] pricelist must be unique / [formatter] show null floats as empty string
|
2013-05-02 14:22:40 +05:30 |
|
Anand Doshi
|
447008b045
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
patches/april_2013/p05_update_file_data.py
|
2013-05-01 14:48:16 +05:30 |
|
Anand Doshi
|
91e4c14470
|
[fixes] [__islocal] use doc.fields.get('__islocal') instead of doc.__islocal
|
2013-05-01 12:00:44 +05:30 |
|
Nabin Hait
|
7ee7eae3ae
|
[item][validation] some validation only after saving
|
2013-04-29 15:10:39 +05:30 |
|
Anand Doshi
|
d54a4741a9
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
stock/doctype/item/item.txt
|
2013-04-24 12:02:54 +05:30 |
|
Anand Doshi
|
a5d19955d1
|
Merge branch 'master' of github.com:webnotes/erpnext into webshop
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
stock/doctype/item/item.txt
|
2013-04-24 11:48:28 +05:30 |
|
Anand Doshi
|
a536eef393
|
Merge branch 'master' into edge
|
2013-04-23 13:10:55 +05:30 |
|
Nabin Hait
|
0a480f4efd
|
fixes in item: organized code
|
2013-04-23 12:54:07 +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 |
|
Nabin Hait
|
81c6a3beef
|
stock uom mandatory for item
|
2013-04-23 11:39:54 +05:30 |
|
Anand Doshi
|
2b349d38d9
|
Merge branch 'master' into edge
|
2013-04-17 15:10:47 +05:30 |
|
Anand Doshi
|
96dae29144
|
[item] [fixes] don't validate for active boms for new items
|
2013-04-17 13:39:55 +05:30 |
|
Anand Doshi
|
c6aecb3f97
|
Merge branch 'master' into edge
Conflicts:
home/page/latest_updates/latest_updates.js
hr/doctype/employee/employee.txt
|
2013-04-16 21:32:06 +05:30 |
|
Anand Doshi
|
3b2fd6e334
|
[sql] [fix] fixed item.py injections
|
2013-04-13 15:54:38 +05:30 |
|
Nabin Hait
|
1bcd551db2
|
fixes in item
|
2013-04-12 16:51:07 +05:30 |
|
Anand Doshi
|
36ecbbd9e8
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-04-12 15:41:31 +05:30 |
|
Nabin Hait
|
bab018b759
|
fixes in item
|
2013-04-11 16:36:26 +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 |
|