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

213 Commits

Author SHA1 Message Date
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
Nabin Hait
d47419483e [perpetual accounting] gl entry: sync stock and account balance 2013-08-06 15:57:25 +05:30
Rushabh Mehta
e67d1fbcdf [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
Nabin Hait
73d04b155c [minor] [fix] test cases fix for perpetual accounting 2013-08-05 12:19:38 +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
Nabin Hait
bbe1448fca Merge branch 'master' into perpetual 2013-08-02 11:53:00 +05:30
Nabin Hait
cac622e097 [accounts] [perpetual] get account and stock balance difference 2013-08-02 11:44:29 +05:30
Nabin Hait
1e2f20a3da [cleanup] code commonified of making sl entry 2013-08-02 11:42:11 +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
Anand Doshi
7180eb6f20 [queries] [optimization] removed redundant code in get_match_cond 2013-07-30 14:40:44 +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
9eb2868bf1 [fix] [minor] remove end of life condition from item query 2013-07-29 13:07:30 +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
152cecc9cd Merge branch 'master' of github.com:webnotes/erpnext 2013-07-25 17:47:38 +05:30
Anand Doshi
f2045fb92e [fix] [minor] set customer/supplier defaults 2013-07-25 17:46:02 +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
Rushabh Mehta
a877053d90 [accounts] [minor] [fix] fixed set_query for Mode of Payment 2013-07-25 10:49: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
61cad5076b [minor] [fix] opportunity form, queries, stock uom replace utility 2013-07-18 13:26:27 +05:30
Nabin Hait
9a380ef40a [fix] [minor] get_query of tax account 2013-07-16 17:24:17 +05:30
Anand Doshi
05859ad42e Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-15 18:30:02 +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
da46a3782f [fix] [minor] get query 2013-07-15 17:52:10 +05:30
Nabin Hait
a9ec49e0bf [fix] [mapper] add rows only table is blank, allow multiple time pull and validation if same item pulled twice 2013-07-15 16:33:24 +05:30
Nabin Hait
cfecd2bc16 [fix] [cleanup] fixes while testing and code cleanup 2013-07-11 17:49:18 +05:30
Saurabh
a29b69245e get_query to servet side 2013-07-10 16:06:31 +05:30
Saurabh
2deca5f3f6 queries to server side 2013-07-10 14:31:29 +05:30
Saurabh
f52dc07a58 queries to server side 2013-07-10 13:07:49 +05:30
Saurabh
38683718e1 [get_query] to server side 2013-07-09 16:34:50 +05:30
Saurabh
ab462d2000 [get_query]to server side 2013-07-09 16:18:52 +05:30
Nabin Hait
3b999225ba [validation] over billing against DN/PR 2013-07-09 12:35:52 +05:30
Saurabh
ebe50397d9 Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-09 10:18:39 +05:30
Saurabh
7f00f7f89b [get_query] to server side 2013-07-09 10:08:18 +05:30
Nabin Hait
2bd37771ca validate with prevdoc 2013-07-08 19:00:29 +05:30
Saurabh
028755941e get_query to server side 2013-07-08 18:45:55 +05:30
Rushabh Mehta
436467a5c9 [purchase order] tests pass 2013-07-08 12:37:59 +05:30
Rushabh Mehta
886c9ef5d1 [material requests] [tests] 2013-07-08 12:08:06 +05:30
Anand Doshi
0b4943cec1 [webshop] shopping cart with shipping rule selector, totals 2013-07-04 23:45:22 +05:30
Anand Doshi
8aaccf7269 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	selling/doctype/lead/lead.txt
 2013-07-04 17:18:45 +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
Rushabh Mehta
080fcc8fcd [mapper] quotation-sales order for mapping in parent + child items 2013-07-04 15:27:04 +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
8f9f8a43c7 [lead] [address] store lead address in Address doctype, with link field=lead 2013-06-28 19:18:33 +05:30
Rushabh Mehta
65d12926fd [setup] bug fixes 2013-06-26 22:31:22 +05:30
Rushabh Mehta
7925bd7079 [merge] 2013-06-24 15:47:02 +05:30
Anand Doshi
61a2f68bc6 [webshop] territories in price list, taxes, updates in shopping cart settings 2013-06-21 17:55:31 +05:30
Saurabh
d35a69b450 Merge branch 'master' of https://github.com/webnotes/erpnext 2013-06-21 16:35:50 +05:30
Nabin Hait
4555d3bcf4 [report][trends] 2013-06-21 16:27:34 +05:30
Saurabh
36cb3caaa7 [Pending so Items for purchase receipt] 2013-06-21 16:25:28 +05:30
Anand Doshi
d52b03a8cc Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	accounts/search_criteria/trend_analyzer/trend_analyzer.py
	buying/doctype/purchase_common/purchase_common.js
 2013-06-21 12:22:52 +05:30
Saurabh
2b02f1410a Trends Analyzer cleanup finished 2013-06-21 10:46:26 +05:30
Saurabh
f8f68c54d9 [trends analyzer] cleanup completed 2013-06-20 18:52:31 +05:30
Saurabh
af5df66847 to avoid merge conflict 2013-06-20 15:00:53 +05:30
Nabin Hait
b8ebbcafa9 [trend analyzer] cleanup 2013-06-20 13:03:10 +05:30
Nabin Hait
616657d4a2 Merge pull request #495 from saurabh6790/master 
[erpnext][reports][Trend Analyzer]
 2013-06-19 22:18:44 -07:00
Nabin Hait
bc2d9e89a7 [validation][buying] stock and non-stock items are now allowed in same document 2013-06-19 14:58:01 +05:30
Saurabh
d4f2199269 [Reports][Trend Analyzer completed] 2013-06-19 14:44:44 +05:30
Saurabh
bfe9fe7c3b [Report][Spliting of Trend Analyzer Completed] 2013-06-19 12:41:28 +05:30
Saurabh
5b6d03e479 [Report][Trend Analyzer] 2013-06-19 12:34:22 +05:30
Saurabh
24208f5c4a [Report][Item-Wise Purchase Receipt] 2013-06-18 15:45:08 +05:30
Rushabh Mehta
64c2764b56 [translations/build] deleted translation files (to be built on demand) 2013-06-17 11:56:41 +05:30
Anand Doshi
abc100302c [cart] create quotation on checkout 2013-06-14 17:44:03 +05:30
Saurabh
1848b71a0a [Reports][Sales and Purchase Trends][Completed] 2013-06-14 15:03:45 +05:30
Rushabh Mehta
37982a6a1f [contact/address] fixed auto setting closes #475 (erpnext) 2013-06-14 13:29:20 +05:30
Saurabh
0326f5414e [reports][purchase and sales trends] 2013-06-13 19:17:56 +05:30
Anand Doshi
060d9248d3 [fixes] buying/selling price lists, communication and website settings 2013-06-12 17:40:36 +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
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