Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,116 Commits 3 Branches 0 Tags 1 GiB
4bfa8d560b
Commit Graph

258 Commits

Author SHA1 Message Date
Nabin Hait
e31a97f355 Calculate taxes and charges total in server side 2014-01-16 14:24:32 +05:30
Nabin Hait
39eb7faeb9 Update billing percentage and status from SI/PI in SO/PO, when net total is zero 2014-01-15 17:36:18 +05:30
Nabin Hait
3a19370892 Rounding issue and divisional loss adjustment 2014-01-14 17:44:34 +05:30
Nabin Hait
14bf711d04 Fixes in frozen accounts validation 2014-01-13 13:28:07 +05:30
Nabin Hait
dbf5e54eab Merge pull request #1290 from akhileshdarjee/price-list 
Price List and Item Price : Valid for Buying and Selling as separate check box
 2014-01-07 21:49:52 -08:00
Akhilesh Darjee
806017c92a Price List and Item Price : Validfor Buying and Selling as separate check box 2014-01-07 18:37:38 +05:30
Nabin Hait
da282d405f Fixes in overbilling validation against DN/PR 2014-01-07 12:41:09 +05:30
Nabin Hait
01441ef37f Removed unwanted debug 2014-01-07 11:59:36 +05:30
Nabin Hait
42db5d76a9 Fixes in overbilling validation 2014-01-06 11:20:37 +05:30
Nabin Hait
7f0406f281 Chekc over billing validation considering tolerance 2014-01-03 17:43:19 +05:30
Nabin Hait
a4db83a934 Fixes in valuation rate calculation in purchase receipt 2014-01-03 12:13:18 +05:30
Nabin Hait
28acaeb345 Fixes in valuation rate calculation in purchase receipt 2014-01-03 11:16:16 +05:30
Nabin Hait
a1ffacaf0b Valuation related charges should only go to stock items 2014-01-02 16:30:16 +05:30
Nabin Hait
861453279d Incoming rate for stock ledger entry should not be rounded 2013-12-23 12:14:45 +05:30
Nabin Hait
9d6e10c910 [fix] [minor] precision in gl entry based on currency format 2013-12-17 14:45:55 +05:30
Akhilesh Darjee
60ae96d588 [fix] [minor] merge conflict fixed 2013-11-26 11:21:07 +05:30
Akhilesh Darjee
ec0da0b177 [fix] [setup_wizard] fiscal year fix for setup wizard 2013-11-25 19:51:18 +05:30
Nabin Hait
8eb0c61649 [minor] merge conflict fixed 2013-11-21 12:28:50 +05:30
Rushabh Mehta
ad45e31356 [copyright] added Contributors 2013-11-20 13:00:28 +05:30
Nabin Hait
48bd4a1ded [fix] [minor] stock value difference rounding issue 2013-11-18 12:42:55 +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
Anand Doshi
1788c8b4d0 Merge branch '1310' of github.com:webnotes/erpnext 2013-11-05 12:10:08 +05:30
Anand Doshi
22c0d78ef4 [minor] [fix] added end of life condition in item query 2013-11-04 16:23:04 +05:30
Nabin Hait
3eb901f47d [merge] merged with master 2013-10-24 11:21:11 +05:30
Nabin Hait
145e5e26fa [patch] delete gl entries for cancelled vouchers 2013-10-22 23:51:41 +05:30
Nabin Hait
cf8ae7c3d9 [fix] [minor] perpetual inventory related 2013-10-22 12:57:19 +05:30
Nabin Hait
5566bcaa0e [cleanup] purchase common 2013-10-18 17:01:56 +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
Nabin Hait
3ceba11208 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-15 12:19:47 +05:30
Nabin Hait
f8924bcf6f [fix] [minor] update serial no in sle while creating auto serial no 2013-10-15 12:19:25 +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
74ec868968 [fix] [minor] added for validate in buying controller 2013-10-14 13:41:55 +05:30
Akhilesh Darjee
7837827e30 [fix] [minor] conversion arte related fixes 2013-10-11 19:06:30 +05:30
Anand Doshi
9106221ea4 [minor] fixes after merge with master 2013-10-10 18:44:26 +05:30
Rushabh Mehta
2eec1eb9a6 [minor] removed prevdoc_date 2013-10-10 17:08:19 +05:30
Rushabh Mehta
f56d73c9bc [minor] removed get_rate 2013-10-10 17:07:53 +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
Nabin Hait
8f05c05bfb Validate warehouse for allowed users and matched company 2013-10-07 13:08:13 +05:30
Rushabh Mehta
acc876e0d7 [minor] [fix] status updater, only change communication status when called explicitly 2013-10-04 13:33:24 +05:30
Rushabh Mehta
6856d74a1b [minor] fixes to crm patch 2013-10-03 18:12:36 +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
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