715 Commits

Author SHA1 Message Date
Rushabh Mehta
0ab1bdf94e [cleanup] old Workflow Engine, State, Sales Browser Control, Naming Series Options 2013-06-11 12:35:46 +05:30
Anand Doshi
f16836d75b Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-06-10 17:59:04 +05:30
Anand Doshi
89e2ac4f47 [voucher import tool] [fix] validate account columns only for voucher import of type Multiple Accounts 2013-06-10 17:58:33 +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
7e2010a649 Merge branch 'master' of github.com:webnotes/erpnext into responsive
Conflicts:
	patches/patch_list.py
	projects/doctype/project/project.py
	utilities/transaction_base.py
2013-06-10 15:25:07 +05:30
Nabin Hait
4bb0eee411 [fixes] outstanding for jv 2013-06-07 17:06:39 +05:30
Nabin Hait
6164b89e95 [report] listing on home page 2013-06-06 17:18:38 +05:30
Anand Doshi
9d04924bc2 [selling] [cleanup] rearranged fields 2013-06-05 20:46:56 +05:30
Nabin Hait
c36e2653f9 [report] itemwise purchase register 2013-06-05 16:13:05 +05:30
Nabin Hait
196b6b8b68 [report] itemwise sales register 2013-06-05 16:12:42 +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
6f19527063 [report] po and pr items to be billed based on amount 2013-06-05 13:02:16 +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
Saurabh
c95436cf43 changes in sales_invoice.js file 2013-06-04 17:01:06 +05:30
Saurabh
c500a47c36 Merge branch 'master' of https://github.com/webnotes/erpnext 2013-06-04 16:08:40 +05:30
Saurabh
4bf08fa1cd [Reports][Supplier Account Head -> Account] and [Project wise Stock Tracking -> Project] 2013-06-04 15:51:16 +05:30
Nabin Hait
df28eefa4b [payment reconciliation] do not allow negative outstanding in case of against_jv 2013-06-04 12:10:33 +05:30
Nabin Hait
5c13163e84 Merge branch 'master' of github.com:webnotes/erpnext 2013-06-04 10:49:57 +05:30
Nabin Hait
7407748b29 customer account head report link added in accounts home page 2013-06-04 10:49:08 +05:30
Rushabh Mehta
0b1567c51c [docs] updated doctype generator, started page generator, and cleanups 2013-06-03 17:39:54 +05:30
Nabin Hait
0feebc1a67 [status updater] managed by controllers and commonified for sales and purchase 2013-06-03 16:45:38 +05:30
Saurabh
df531accc9 [report] customer account head 2013-06-03 16:18:24 +05:30
Saurabh
a0814bb96a [report] customer account head 2013-06-03 16:10:52 +05:30
Nabin Hait
de79aaa131 Update sales_invoice.py 2013-05-30 18:28:30 +05:30
Nabin Hait
5b3b123fe8 Update sales_invoice.py 2013-05-30 17:55:16 +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
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