Nabin Hait
|
9d6e10c910
|
[fix] [minor] precision in gl entry based on currency format
|
2013-12-17 14:45:55 +05:30 |
|
Rushabh Mehta
|
ad45e31356
|
[copyright] added Contributors
|
2013-11-20 13:00:28 +05:30 |
|
Anand Doshi
|
0c26f8116d
|
Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
accounts/doctype/account/account.py
controllers/accounts_controller.py
patches/patch_list.py
selling/doctype/sales_common/sales_common.py
stock/doctype/purchase_receipt/purchase_receipt.py
|
2013-11-15 19:12:09 +05:30 |
|
Nabin Hait
|
89ad6f2dab
|
[fix] [conflict]
|
2013-10-18 12:55:59 +05:30 |
|
Nabin Hait
|
d1fd1e2d89
|
[Cleanup] Sales Common deprecated
|
2013-10-18 12:50:28 +05:30 |
|
Nabin Hait
|
096d363087
|
[fix] fixed merge conflict
|
2013-10-18 12:50:28 +05:30 |
|
Akhilesh Darjee
|
61b5c59e70
|
[fix] fixed conversion rate for mapping any documents
|
2013-10-15 20:24:34 +05:30 |
|
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
|
7837827e30
|
[fix] [minor] conversion arte related fixes
|
2013-10-11 19:06:30 +05:30 |
|
Anand Doshi
|
373680bbae
|
Merged master into wsgi
|
2013-10-10 16:04:40 +05:30 |
|
Nabin Hait
|
77f37e6b7c
|
Update Serial No details through serial_no controller
|
2013-10-08 17:11:33 +05:30 |
|
Rushabh Mehta
|
800b3aa437
|
[crm] Updated status and workflow for Lead > Opportunity > Quotation > Sales Order
|
2013-10-03 17:26:33 +05:30 |
|
Nabin Hait
|
7a75e10a61
|
[fix] [minor] perpetual inventory: account for each warehouse
|
2013-09-17 10:21:20 +05:30 |
|
Nabin Hait
|
da3110fc12
|
[merge] [minor] merged with master
|
2013-09-02 13:07:49 +05:30 |
|
Nabin Hait
|
94c90bdbf9
|
[fix] [minor] buying amount for sales bom item
|
2013-08-30 22:48:19 +05:30 |
|
Nabin Hait
|
bb77756069
|
[fix] [minor] auto accounting for stock transactions
|
2013-08-29 18:19:37 +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
|
27994c216a
|
[perpetual accounting] gl entries based on stock_value difference in sl entries
|
2013-08-26 16:53:30 +05:30 |
|
Nabin Hait
|
11bd44e447
|
[minor] fixed conflict while merging with master
|
2013-08-21 17:51:46 +05:30 |
|
Nabin Hait
|
040d1f3a0e
|
[minor] imported cstr in selling_controller
|
2013-08-21 17:04:33 +05:30 |
|
Nabin Hait
|
e98ab7a2f4
|
[fix] [minor] fixes in updating warranty period of serial no
|
2013-08-21 16:56:12 +05:30 |
|
Nabin Hait
|
05652874fc
|
[merge] [minor] merged with master for serial_no updatess
|
2013-08-20 11:28:38 +05:30 |
|
Anand Doshi
|
b02fba9c77
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-08-19 20:03:51 +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 |
|
Rushabh Mehta
|
170be3b717
|
[minor] merge master
|
2013-08-14 18:41:42 +05:30 |
|
Rushabh Mehta
|
62030e05cc
|
[Serial No] Major updates, code cleanup, "In Store" is now "Available". Serial No can only be created via Stock Entry / Purchase Receipt. Serial No can be auto created using Series if mentioned in Item master
|
2013-08-14 18:39:27 +05:30 |
|
Anand Doshi
|
30324b857a
|
[fix] [minor] set due date in sales invoice after mapping
|
2013-08-14 17:07:42 +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 |
|
Anand Doshi
|
5dd6b1d082
|
[optimization] [minor] pass filtered stock ledger entries to get_buying_amount
|
2013-08-07 19:27:30 +05:30 |
|
Nabin Hait
|
8daa702a90
|
Merge branch 'master' into perpetual
|
2013-08-07 12:46:50 +05:30 |
|
Anand Doshi
|
fbe1e167d4
|
[fix] [selling] reduce round-off loss when using tax inclusive price
|
2013-08-06 19:38:19 +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 |
|
Rushabh Mehta
|
4dca40195e
|
[feature] Ability to set UOM as Integer-only and related validations.
|
2013-07-25 17:45:59 +05:30 |
|
Nabin Hait
|
a9ec49e0bf
|
[fix] [mapper] add rows only table is blank, allow multiple time pull and validation if same item pulled twice
|
2013-07-15 16:33:24 +05:30 |
|
Nabin Hait
|
2bd37771ca
|
validate with prevdoc
|
2013-07-08 19:00:29 +05:30 |
|
Anand Doshi
|
0b4943cec1
|
[webshop] shopping cart with shipping rule selector, totals
|
2013-07-04 23:45:22 +05:30 |
|
Anand Doshi
|
8aaccf7269
|
Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
Conflicts:
selling/doctype/lead/lead.txt
|
2013-07-04 17:18:45 +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 |
|
Rushabh Mehta
|
080fcc8fcd
|
[mapper] quotation-sales order for mapping in parent + child items
|
2013-07-04 15:27:04 +05:30 |
|
Anand Doshi
|
abc100302c
|
[cart] create quotation on checkout
|
2013-06-14 17:44:03 +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
|
3543f30046
|
[calculations] [client/server] first cut
|
2013-05-24 19:25:01 +05:30 |
|
Anand Doshi
|
65d8755567
|
[selling] [calculation] fixes
|
2013-05-21 19:53:33 +05:30 |
|
Anand Doshi
|
f309613a7d
|
[selling] [calculations] client side calculations, cleanup, patch fixes
|
2013-05-21 19:35:06 +05:30 |
|
Anand Doshi
|
1dde46aff0
|
[buying, selling] [refactor] get item details
|
2013-05-15 21:15:57 +05:30 |
|
Anand Doshi
|
39384d36ea
|
[precision] server side cleanup and client side precision method
|
2013-05-11 19:39:53 +05:30 |
|