Rushabh Mehta
|
0ab1bdf94e
|
[cleanup] old Workflow Engine, State, Sales Browser Control, Naming Series Options
|
2013-06-11 12:35:46 +05:30 |
|
Rushabh Mehta
|
cd4bfa6b9a
|
[docs] added for stock module
|
2013-06-11 12:04:01 +05:30 |
|
Rushabh Mehta
|
c382eb58d5
|
[cleanup] removed Featured Item, Website Product Category, Valuation Control
|
2013-06-11 12:03:37 +05:30 |
|
Anand Doshi
|
27a981677e
|
[buying] [cleanup] deprecated load_default_taxes and get_purchase_tax_details
|
2013-06-10 16:32:55 +05:30 |
|
Anand Doshi
|
9d04924bc2
|
[selling] [cleanup] rearranged fields
|
2013-06-05 20:46:56 +05:30 |
|
Anand Doshi
|
12cea9587f
|
[terms and conditions] removed terms html and added terms and conditions to purchase invoice
|
2013-06-05 14:59:28 +05:30 |
|
Anand Doshi
|
bf3e54a45b
|
[issues #437] [fix] pulling terms and conditions
|
2013-06-05 14:11:32 +05:30 |
|
Nabin Hait
|
c6548b64c2
|
[fixes][merge conflict]
|
2013-06-05 12:53:53 +05:30 |
|
Nabin Hait
|
90202aec2b
|
[merge conflict]
|
2013-06-05 12:37:10 +05:30 |
|
Nabin Hait
|
ad600cce22
|
bom exploded items grouped by items
|
2013-06-04 16:56:56 +05:30 |
|
Nabin Hait
|
0feebc1a67
|
[status updater] managed by controllers and commonified for sales and purchase
|
2013-06-03 16:45:38 +05:30 |
|
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
|
d0b007235d
|
[buying/selling] fixes after responsive merge
|
2013-05-28 18:54:48 +05:30 |
|
Anand Doshi
|
5d74c82c06
|
Merge branch 'webshop' of github.com:webnotes/erpnext into responsive
Conflicts:
selling/doctype/quotation/quotation.js
|
2013-05-28 17:46:50 +05:30 |
|
Anand Doshi
|
923d41dfd2
|
[selling/buying] [fixes] fixes in client side code, server side code, print formats
|
2013-05-28 17:23:36 +05:30 |
|
Anand Doshi
|
fc77718a3d
|
[selling/buying] [fixes] updated js files of various doctypes related to selling/g/buying
|
2013-05-27 19:29:07 +05:30 |
|
Anand Doshi
|
149b461e62
|
Merge branch 'master' of github.com:webnotes/erpnext into webshop
|
2013-05-24 19:28:36 +05:30 |
|
Anand Doshi
|
3543f30046
|
[calculations] [client/server] first cut
|
2013-05-24 19:25:01 +05:30 |
|
Rushabh Mehta
|
126f2c62f2
|
[merge] merge with master
|
2013-05-24 16:09:13 +05:30 |
|
Nabin Hait
|
b56412c646
|
[fixes][aii] cancelled gl entry for delivery note and patch
|
2013-05-23 17:41:52 +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 |
|
Nabin Hait
|
b7e07ac6a5
|
[fixes] updated no_copy field
|
2013-05-22 12:10:16 +05:30 |
|
Anand Doshi
|
f309613a7d
|
[selling] [calculations] client side calculations, cleanup, patch fixes
|
2013-05-21 19:35:06 +05:30 |
|
Anand Doshi
|
48787e944e
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
patches/april_2013/p05_update_file_data.py
|
2013-05-17 15:10:57 +05:30 |
|
Nabin Hait
|
1fd546f424
|
[fixes] prosting date for gl entry
|
2013-05-16 11:02:07 +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
|
21f4ea36b2
|
[selling] [calculations] server side calculations, test cases and rounding based on currency number format
|
2013-05-10 18:08:32 +05:30 |
|
Nabin Hait
|
f377402592
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-05-09 14:16:14 +05:30 |
|
Nabin Hait
|
5dc5bf9972
|
[stock entry] total amount field added
|
2013-05-09 14:15:24 +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 |
|
Rushabh Mehta
|
f514998011
|
merge
|
2013-05-09 11:42:35 +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 |
|
Anand Doshi
|
c414175a44
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-05-08 11:45:32 +05:30 |
|
Nabin Hait
|
04f888fa52
|
[fixes] item_code non-mandatory in item if naming_series
|
2013-05-07 16:03:10 +05:30 |
|
Nabin Hait
|
f2d4df975e
|
[fixes] floating point issue in buying rate
|
2013-05-07 13:12:02 +05:30 |
|
Nabin Hait
|
c1b9619321
|
[fixes] company for auto-material request
|
2013-05-07 11:16:20 +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 |
|
Anand Doshi
|
0f5f584651
|
[stock entry] [test] fixes in test cases
|
2013-05-03 14:34:12 +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
|
d3e00995db
|
[conflicts] [merged]
|
2013-05-02 16:02:59 +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
|
88f6acdbe4
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-05-02 14:47:10 +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 |
|
Nabin Hait
|
f2edbbd5cb
|
[serial no][validation] status delivered -> in store, allowed for material receipt
|
2013-05-02 11:49:02 +05:30 |
|
Nabin Hait
|
02bc8bfe7e
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-05-02 11:39:43 +05:30 |
|
Rushabh Mehta
|
ecb36f2cb0
|
[purchase] [validation] validate warehouse belongs to company if set
|
2013-05-02 11:34:37 +05:30 |
|