Anand Doshi
|
200c8f7980
|
Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
accounts/doctype/sales_invoice/sales_invoice.py
selling/doctype/sales_common/sales_common.py
|
2013-05-29 12:30:54 +05:30 |
|
Anand Doshi
|
72edc3d955
|
[accounts] [auto inventory accounting] changed naming series and message of journal vouchers created for Auto Inventory Accounting
|
2013-05-29 12:13:16 +05:30 |
|
Nabin Hait
|
f6911fb51c
|
Update sales_invoice.py
[fixes] pulling available qty on selection of item in case of pos
|
2013-05-29 11:06:17 +05:30 |
|
Anand Doshi
|
d0b007235d
|
[buying/selling] fixes after responsive merge
|
2013-05-28 18:54:48 +05:30 |
|
Nabin Hait
|
0dbd62f163
|
[voucher import tool][fix] fixes for handling exception
|
2013-05-28 18:16:44 +05:30 |
|
Nabin Hait
|
58c3348ca6
|
[voucher import tool][fix] fixes for handling exception
|
2013-05-28 18:06:20 +05:30 |
|
Nabin Hait
|
7742e2baed
|
[report][fix]
|
2013-05-28 17:58:36 +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
|
ca63548ae0
|
[test sales invoice] [fix] fixed values of various test cases
|
2013-05-28 17:42:41 +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 |
|
Nabin Hait
|
9fce94ff96
|
[report] reports link added into accounts home page
|
2013-05-28 17:12:15 +05:30 |
|
Nabin Hait
|
8b509f56b7
|
[utility function] fix total debit/credit due to floating point issue
|
2013-05-28 16:52:30 +05:30 |
|
Nabin Hait
|
eca0531068
|
[report] purchase order/ received items to be billed
|
2013-05-28 16:07:03 +05:30 |
|
Nabin Hait
|
34d1b1415e
|
[report] filter added base on territory in sales personwise transaction summary
|
2013-05-28 12:32:21 +05:30 |
|
Anand Doshi
|
a3d8494c77
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
|
2013-05-27 19:29:43 +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
|
996191e8b7
|
[purchase invoice] [fix] error message for missing expense account for an item
|
2013-05-27 18:28:36 +05:30 |
|
Nabin Hait
|
da6e4670a3
|
[report][fix] filter fixes in sales/pur register
|
2013-05-27 16:34:15 +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
|
7cd49529f4
|
[sales invoice][fix] float precision issue
|
2013-05-24 13:51:25 +05:30 |
|
Nabin Hait
|
93ed5b9dae
|
[sales invoice][fix] check item rate with sales order and delivery note
|
2013-05-23 19:21:58 +05:30 |
|
Nabin Hait
|
3d75ad1896
|
[sales invoice][fix] check item rate with sales order and delivery note
|
2013-05-23 19:14:28 +05:30 |
|
Rushabh Mehta
|
b394a25904
|
[ui] fixed #83, #103, #114, #116 and other minor ui issues, upgraded to jquery 1.9
|
2013-05-23 16:03:49 +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
|
5dc36f416a
|
[permission] delete permission added for pos setting
|
2013-05-23 12:53:47 +05:30 |
|
Nabin Hait
|
d39b30ab99
|
[validation] invoice rate will be same as order/delivery
|
2013-05-23 11:44:18 +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 |
|
Rushabh Mehta
|
4a2f0f8c36
|
[js-libs] upgraded to latest bootstrap and font-awesome
|
2013-05-22 11:57:05 +05:30 |
|
Anand Doshi
|
f309613a7d
|
[selling] [calculations] client side calculations, cleanup, patch fixes
|
2013-05-21 19:35:06 +05:30 |
|
Rushabh Mehta
|
893bb122f2
|
[docs] added ability to add static pages in docs folder and README.md in modules and doctypes
|
2013-05-20 13:19:47 +05:30 |
|
Anand Doshi
|
0eef6e9e42
|
Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
patches/patch_list.py
|
2013-05-15 21:18:27 +05:30 |
|
Nabin Hait
|
ebf3199dbe
|
[fixes] Write off cost center linked to cost center in pur invoice
|
2013-05-13 11:15:53 +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 |
|
Nabin Hait
|
765383b3cf
|
[report] monthly salary register
|
2013-05-10 18:41:58 +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 |
|
Anand Doshi
|
ce85145779
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-05-10 13:38:42 +05:30 |
|
Anand Doshi
|
1252729e1c
|
[sales invoice] [fix] bug fix in setting pos values on save
|
2013-05-10 13:38:23 +05:30 |
|
Nabin Hait
|
6ac6858571
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2013-05-09 16:56:59 +05:30 |
|
Nabin Hait
|
e1b2ae5739
|
[fixes] float precision for pur invoice
|
2013-05-09 16:56:19 +05:30 |
|
Anand Doshi
|
ef06a4b349
|
[autoname] [cleanup] strip blank spaces and remove autoname where naming_series: can be set in doctype
|
2013-05-09 15:13:47 +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
|
c414175a44
|
Merge branch 'master' of github.com:webnotes/erpnext into edge
|
2013-05-08 11:45:32 +05:30 |
|
Nabin Hait
|
f7bdf8e05a
|
[fixes][jv] set clearance date as null on saving document
|
2013-05-07 16:48:55 +05:30 |
|
Nabin Hait
|
04f888fa52
|
[fixes] item_code non-mandatory in item if naming_series
|
2013-05-07 16:03:10 +05:30 |
|