Akhilesh Darjee
|
c53dbc7cdf
|
[flat discount] implemented flat discount on client side
|
2013-12-25 19:46:20 +05:30 |
|
Akhilesh Darjee
|
63aa5fd673
|
[flat discount] implemented flat discount on server side
|
2013-12-24 20:30:03 +05:30 |
|
Akhilesh Darjee
|
b09dc46e68
|
[flat discount] first commit
|
2013-12-23 15:49:08 +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
|
e83069cb32
|
[fix] update future gl entries for stock
|
2013-11-14 18:40:08 +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 |
|
Rushabh Mehta
|
f56d73c9bc
|
[minor] removed get_rate
|
2013-10-10 17:07:53 +05:30 |
|
Nabin Hait
|
11f41955c9
|
[minor] fixed conflict while merging perpetual branch into master
|
2013-09-24 14:36:55 +05:30 |
|
Nabin Hait
|
142007a226
|
[fix] [minor] perpetual inventory: account for each warehouse
|
2013-09-17 15:15:16 +05:30 |
|
Nabin Hait
|
5cd1d54347
|
[minor] merged with master branch
|
2013-09-17 10:30:24 +05:30 |
|
Nabin Hait
|
7a75e10a61
|
[fix] [minor] perpetual inventory: account for each warehouse
|
2013-09-17 10:21:20 +05:30 |
|
Akhilesh Darjee
|
db59ffb76d
|
[usability] item price moved to price list
|
2013-09-11 13:05:24 +05:30 |
|
Anand Doshi
|
c6d17a6989
|
[fix] [minor] set price list currency and conversion rate
|
2013-09-05 18:18:40 +05:30 |
|
Anand Doshi
|
179e3772c0
|
[fix] [minor] item wise taxes
|
2013-09-05 16:53:57 +05:30 |
|
Nabin Hait
|
2e296fa46f
|
[fix] [minor] Repost future gl entries and testcases
|
2013-08-28 18:53:11 +05:30 |
|
Nabin Hait
|
9b09c95d83
|
[cleanup] [accounts] delete gl entries on cancellation of accounting transactions
|
2013-08-21 17:47:11 +05:30 |
|
Nabin Hait
|
44da6f2efe
|
[fix] [minor] fixed conflict while merging with master
|
2013-08-19 11:06:06 +05:30 |
|
Nabin Hait
|
21cf403b57
|
[fix] [minor] paid amount should be zero if not pos invoice
|
2013-08-16 15:15:16 +05:30 |
|
Anand Doshi
|
e42a0222d5
|
[minor] [fix] precision for float fields on server-side
|
2013-08-12 11:58:02 +05:30 |
|
Rushabh Mehta
|
4a404e9299
|
[price list] Separated Default Price List for Selling and Buying and changed fieldnames
|
2013-08-09 18:11:35 +05:30 |
|
Rushabh Mehta
|
7c2a2e24a2
|
[demo] [minor] simulate quotation
|
2013-08-07 15:08:11 +05:30 |
|
Nabin Hait
|
cc0e2d1740
|
[minor] merged with master
|
2013-08-06 16:19:18 +05:30 |
|
Nabin Hait
|
43eba26dcf
|
[perpetual accounting] make gl entries relevant for different transactions
|
2013-08-06 16:00:50 +05:30 |
|
Rushabh Mehta
|
e67d1fbcdf
|
[license] [minor] Updated License Text in all js and py files
|
2013-08-05 14:59:54 +05:30 |
|
Anand Doshi
|
e79d57ca19
|
[salary slip] total no. of working days calculation [issue] webnotes/erpnext#285
|
2013-08-02 19:31:41 +05:30 |
|
Nabin Hait
|
a36adbd1e0
|
[minor] [fix] make sl entry
|
2013-08-02 14:50:12 +05:30 |
|
Anand Doshi
|
078129f58f
|
[fix] [minor] removed default from conversion_rate
|
2013-08-01 16:54:32 +05:30 |
|
Anand Doshi
|
17350b899f
|
[fix] [mapper] from delivery note to sales invoice, only map unbilled items
|
2013-08-01 15:45:23 +05:30 |
|
Nabin Hait
|
1f996c3121
|
[minor] currency trigger should not be called in refresh
|
2013-07-29 19:02:09 +05:30 |
|
Nabin Hait
|
19d945a4e7
|
[minor] [fix] apply float precision on over-billing validation
|
2013-07-29 18:35:39 +05:30 |
|
Anand Doshi
|
7474012789
|
[fix] [minor] valide for freezed account
|
2013-07-26 16:07:52 +05:30 |
|
Nabin Hait
|
e32921562b
|
[fix] [minor] over-billing validation
|
2013-07-26 12:51:06 +05:30 |
|
Nabin Hait
|
d23e5c8a9a
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-07-26 11:01:43 +05:30 |
|
Nabin Hait
|
3986badd06
|
[feature] If customer/supplier account freezed do not allow to make any transaction
|
2013-07-26 11:01:17 +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
|
4166c35277
|
[fix] [minor] over billing validation against delivery note
|
2013-07-25 15:14:59 +05:30 |
|
Nabin Hait
|
48a0bd3eda
|
[minor] [fix] price list currency read only and SO-MR mapping
|
2013-07-23 15:31:39 +05:30 |
|
Anand Doshi
|
d4e76bc1db
|
[minor] [transaction] validate exchange rate in calculate taxes and totals
|
2013-07-15 18:10:51 +05:30 |
|
Nabin Hait
|
cfecd2bc16
|
[fix] [cleanup] fixes while testing and code cleanup
|
2013-07-11 17:49:18 +05:30 |
|
Nabin Hait
|
3b999225ba
|
[validation] over billing against DN/PR
|
2013-07-09 12:35:52 +05:30 |
|
Nabin Hait
|
2bd37771ca
|
validate with prevdoc
|
2013-07-08 19:00:29 +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
|
15db6c4659
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.py
accounts/doctype/sales_invoice_item/sales_invoice_item.txt
buying/doctype/supplier_quotation/supplier_quotation.js
patches/patch_list.py
|
2013-07-02 11:50:32 +05:30 |
|
Anand Doshi
|
61a2f68bc6
|
[webshop] territories in price list, taxes, updates in shopping cart settings
|
2013-06-21 17:55:31 +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 |
|