Commit Graph

88 Commits

Author SHA1 Message Date
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
a93ca595e1 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-05 13:04:51 +05:30
Anand Doshi
5fcf42bd4b [issue #431] [fix] pulling taxes from master 2013-06-05 13:04:09 +05:30
Nabin Hait
c6548b64c2 [fixes][merge conflict] 2013-06-05 12:53:53 +05:30
Nabin Hait
0feebc1a67 [status updater] managed by controllers and commonified for sales and purchase 2013-06-03 16:45:38 +05:30
Anand Doshi
53b7342b09 [itemwise tax details] store tax rate as well as tax amount for that item tax combination 2013-05-31 11:50:01 +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
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
Nabin Hait
f2d4df975e [fixes] floating point issue in buying rate 2013-05-07 13:12:02 +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
787c02ee42 aii fixes 2013-03-29 16:42:33 +05:30
Nabin Hait
557d858d89 aii: patches and default values fetching 2013-03-25 18:28:16 +05:30
Nabin Hait
0fc2454384 aii: patches and fine tuning 2013-03-25 11:06:00 +05:30
Anand Doshi
8c5844e3fb show sales invoice data in gross profit report 2013-03-21 20:24:10 +05:30
Nabin Hait
a0e7c1539b aii: book expense in delivery note instead of sales invoice 2013-03-21 18:37:06 +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
80abad2ee0 aii: default account from company 2013-03-19 18:18:52 +05:30
Nabin Hait
928355ad9a Merge branch 'master' of github.com:webnotes/erpnext 2013-03-19 12:02:13 +05:30
Nabin Hait
89a94d8135 aii: stock reconciliation with test case 2013-03-19 12:01:46 +05:30
Nabin Hait
c3afb256b4 aii: stock entry 2013-03-19 12:01:24 +05:30
Anand Doshi
1cf7391562 patch to fix incorrect gl entries due to payment reconciliation between 2013-03-11 and 2013-03-15 2013-03-15 13:42:31 +05:30
Nabin Hait
8c7234f270 aii: gl_entries for sales invoice 2013-03-11 16:32:33 +05:30
Nabin Hait
54d209ffb0 sub-contracting code refactored for po 2013-03-01 18:51:10 +05:30
Nabin Hait
a9afc254bc fixes for conversion factor in old invoices 2013-03-01 10:41:41 +05:30
Anand Doshi
1bfec3a6c8 buying - update valuation rate when item row has item_code and quantity, else set valuation rate as 0 2013-02-28 19:17:46 +05:30
billyfordson
9b352309c6 Adding German translation 2013-02-27 17:36:23 +01:00
Anand Doshi
55d9a62114 Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	stock/doctype/purchase_receipt/purchase_receipt.py
2013-02-27 18:14:28 +05:30
Nabin Hait
5418d71fc0 sub-contracting rewrite with testcases 2013-02-27 18:11:17 +05:30
Anand Doshi
4a7248ee0b commonified some purchase code, added test case for auto inventory accounting for purchase invoice 2013-02-27 18:10:30 +05:30