Anand Doshi
|
7e9048570e
|
Merge branch 'master' of github.com:webnotes/erpnext into wsgi
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.txt
controllers/selling_controller.py
patches/patch_list.py
selling/doctype/lead/lead.py
selling/doctype/opportunity/opportunity.py
selling/doctype/quotation/quotation.py
selling/doctype/quotation/quotation.txt
selling/doctype/sales_order/sales_order.txt
stock/doctype/purchase_receipt/purchase_receipt.py
stock/doctype/serial_no/serial_no.py
stock/doctype/stock_entry/stock_entry.py
stock/doctype/stock_ledger_entry/stock_ledger_entry.py
|
2013-10-15 12:18:46 +05:30 |
|
Akhilesh Darjee
|
74ec868968
|
[fix] [minor] added for validate in buying controller
|
2013-10-14 13:41:55 +05:30 |
|
Anand Doshi
|
9106221ea4
|
[minor] fixes after merge with master
|
2013-10-10 18:44:26 +05:30 |
|
Rushabh Mehta
|
2eec1eb9a6
|
[minor] removed prevdoc_date
|
2013-10-10 17:08:19 +05:30 |
|
Rushabh Mehta
|
f56d73c9bc
|
[minor] removed get_rate
|
2013-10-10 17:07:53 +05:30 |
|
Anand Doshi
|
373680bbae
|
Merged master into wsgi
|
2013-10-10 16:04:40 +05:30 |
|
Nabin Hait
|
8f05c05bfb
|
Validate warehouse for allowed users and matched company
|
2013-10-07 13:08:13 +05:30 |
|
Nabin Hait
|
da3110fc12
|
[merge] [minor] merged with master
|
2013-09-02 13:07:49 +05:30 |
|
Rushabh Mehta
|
e89c533eaa
|
[sales/purchase] [minor] Set tax table on insert if tax master set, but table missing
|
2013-08-29 15:32:46 +05:30 |
|
Nabin Hait
|
05652874fc
|
[merge] [minor] merged with master for serial_no updatess
|
2013-08-20 11:28:38 +05:30 |
|
Anand Doshi
|
2e31e097fa
|
[fix] [minor] _round function - implement round halfs to nearest even number
|
2013-08-19 19:58:23 +05:30 |
|
Nabin Hait
|
44da6f2efe
|
[fix] [minor] fixed conflict while merging with master
|
2013-08-19 11:06:06 +05:30 |
|
Anand Doshi
|
47e14a9de4
|
[fix] [minor] rate calculation on server side, only if blank/0 (honour client side calculation sequence), shopping cart settings
|
2013-08-13 13:01:12 +05:30 |
|
Rushabh Mehta
|
0b9954059c
|
[cleanup] [minor] price list field rename (wip), set default supplier from item, make demo - purchase cycle (wip)
|
2013-08-09 15:30:11 +05:30 |
|
Nabin Hait
|
cc0e2d1740
|
[minor] merged with master
|
2013-08-06 16:19:18 +05:30 |
|
Rushabh Mehta
|
e67d1fbcdf
|
[license] [minor] Updated License Text in all js and py files
|
2013-08-05 14:59:54 +05:30 |
|
Nabin Hait
|
a36adbd1e0
|
[minor] [fix] make sl entry
|
2013-08-02 14:50:12 +05:30 |
|
Anand Doshi
|
f2045fb92e
|
[fix] [minor] set customer/supplier defaults
|
2013-07-25 17:46:02 +05:30 |
|
Rushabh Mehta
|
436467a5c9
|
[purchase order] tests pass
|
2013-07-08 12:37:59 +05:30 |
|
Rushabh Mehta
|
886c9ef5d1
|
[material requests] [tests]
|
2013-07-08 12:08:06 +05:30 |
|
Anand Doshi
|
99100a4135
|
[webshop] shopping cart settings, update price list, taxes and shipping rule on change of address, apply defaults on creation of fresh quotation
|
2013-07-04 17:13:53 +05:30 |
|
Anand Doshi
|
d52b03a8cc
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
accounts/search_criteria/trend_analyzer/trend_analyzer.py
buying/doctype/purchase_common/purchase_common.js
|
2013-06-21 12:22:52 +05:30 |
|
Nabin Hait
|
bc2d9e89a7
|
[validation][buying] stock and non-stock items are now allowed in same document
|
2013-06-19 14:58:01 +05:30 |
|
Anand Doshi
|
abc100302c
|
[cart] create quotation on checkout
|
2013-06-14 17:44:03 +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
|
b392878f15
|
[buying] [fix] store item tax amount only if field exists
|
2013-06-05 17:46:20 +05:30 |
|
Anand Doshi
|
bf3e54a45b
|
[issues #437] [fix] pulling terms and conditions
|
2013-06-05 14:11:32 +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
|
3543f30046
|
[calculations] [client/server] first cut
|
2013-05-24 19:25:01 +05:30 |
|
Nabin Hait
|
9053cbc9f8
|
[fixes][patch] update valuation rate in purchase cycle and repost patch
|
2013-05-20 15:28:44 +05:30 |
|
Nabin Hait
|
fdefe0750a
|
[fixes] item valuation rate in pur cycle
|
2013-05-20 13:59:24 +05:30 |
|
Anand Doshi
|
1dde46aff0
|
[buying, selling] [refactor] get item details
|
2013-05-15 21:15:57 +05:30 |
|
Anand Doshi
|
c99853c8d4
|
[buying] [calculation] fix in calculate outstanding amount
|
2013-05-14 13:35:09 +05:30 |
|
Anand Doshi
|
39384d36ea
|
[precision] server side cleanup and client side precision method
|
2013-05-11 19:39:53 +05:30 |
|
Anand Doshi
|
5af812a832
|
[precision] [fixes]
|
2013-05-10 19:23:02 +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
|
e1b2ae5739
|
[fixes] float precision for pur invoice
|
2013-05-09 16:56:19 +05:30 |
|
Anand Doshi
|
b8b1e58c4d
|
[buying controller] [fix] use discount_rate instead of discount
|
2013-05-06 12:52:46 +05:30 |
|
Anand Doshi
|
eb41ffd24e
|
[buying controller] [fix] fixed message for company warehouse mismatch validation
|
2013-05-02 18:10:19 +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 |
|
Rushabh Mehta
|
ecb36f2cb0
|
[purchase] [validation] validate warehouse belongs to company if set
|
2013-05-02 11:34:37 +05:30 |
|
Nabin Hait
|
d58d1b5a18
|
validation for stock and nonstock items in purchase cycle
|
2013-04-26 17:25:44 +05:30 |
|
Nabin Hait
|
04c1f94b4e
|
[DN][usability] copy cost center in each row
|
2013-04-26 16:27:51 +05:30 |
|
Nabin Hait
|
205f7ce620
|
validation for stock and nonstock items in purchase cycle
|
2013-04-26 13:35:06 +05:30 |
|
Nabin Hait
|
ebd514442a
|
[script report] accounts payable migrated to new style
|
2013-04-23 15:36:26 +05:30 |
|
Nabin Hait
|
0fc2454384
|
aii: patches and fine tuning
|
2013-03-25 11:06:00 +05:30 |
|
Saurabh
|
076535d979
|
Merge branch 'master' of https://github.com/webnotes/erpnext
Conflicts:
controllers/buying_controller.py
|
2013-03-20 13:48:48 +05:30 |
|
Saurabh
|
6f75318134
|
no -ve balance accepted in sales and purchase invoice
|
2013-03-20 12:55:28 +05:30 |
|
Nabin Hait
|
89a94d8135
|
aii: stock reconciliation with test case
|
2013-03-19 12:01:46 +05:30 |
|