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

1087 Commits

Author SHA1 Message Date
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
Rushabh Mehta
148cbaeafe [minor] fixed help for Sales Invoice / Purchase Invoice 2013-07-24 21:44:59 +05:30
Anand Doshi
6c7f3db755 [report] [issue] #641 - added customer name and supplier name in accounts receivable and accounts payable reports respectively 2013-07-24 16:49:11 +05:30
Anand Doshi
56421289cc Merge branch 'master' of github.com:webnotes/erpnext 2013-07-23 17:16:22 +05:30
Anand Doshi
fafb9a8843 [fix] [report] general ledger - group by ledger and group by voucher 2013-07-23 17:13:55 +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
648a5c7e33 [fix] added required permissions for fiscal year, brand, company, country, currency, item group, price list, uom and warehouse 2013-07-23 12:07:55 +05:30
Rushabh Mehta
b54cd9967e Merge branch 'master' of github.com:webnotes/erpnext 2013-07-22 15:59:48 +05:30
Rushabh Mehta
c9bcfd1070 [cleanup] [minor] removed 'System Manager' permission for new setups 2013-07-22 15:33:10 +05:30
Anand Doshi
21503f8fb9 [minor] [fix] on row add processing, [cleanup] shifted validate link and fetch to script_manager 2013-07-22 13:38:28 +05:30
Nabin Hait
461b417871 [minor] [fix] trigger in supplier address and contact person field 2013-07-20 18:29:45 +05:30
Anand Doshi
6fa5e42b40 [minor] [fix] [issue] #617 2013-07-19 15:33:11 +05:30
Anand Doshi
535d833523 [minor] [fix] call company trigger in onload for a new selling/buying transaction 2013-07-19 13:51:07 +05:30
Anand Doshi
82e006917a [minor] [fix] get queries 2013-07-19 12:54:33 +05:30
Anand Doshi
c8b2c0f091 [minor] [fix] net_total_export printing and hover effect for brand in navbar 2013-07-18 18:15:56 +05:30
Nabin Hait
5b43b3dca5 merged with slow branch 2013-07-18 12:28:09 +05:30
Nabin Hait
6f61e2c426 [fix] [minor] net_total on sales/purchase register 2013-07-16 18:47:06 +05:30
Nabin Hait
6a3b951352 [accounts] [feature] optional checkbox for same rate validation in sales cycle 2013-07-16 18:34:35 +05:30
Nabin Hait
9a380ef40a [fix] [minor] get_query of tax account 2013-07-16 17:24:17 +05:30
Nabin Hait
496219ce6b Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-16 14:40:40 +05:30
Nabin Hait
cf1829d21c Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-07-16 14:39:39 +05:30
Nabin Hait
cbc96d5d14 [fix] [report] accounts receivable/payable 2013-07-16 13:13:38 +05:30
Nabin Hait
642634f6c8 [fix] [report] sales/purchase register: if income/expense account entered in tax table for discount 2013-07-16 12:11:00 +05:30
Anand Doshi
05859ad42e Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-15 18:30:02 +05:30
Nabin Hait
00dadc8bd5 [fix] [minor] get query 2013-07-15 18:16:37 +05:30
Anand Doshi
1ffc5b576c [minor] [for territory] auto add default For Territory in a new Tax Master, Shipping Rule and Price List 2013-07-15 18:09:43 +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
a279d78496 [minor] [fix] 2013-07-15 13:04:33 +05:30
Nabin Hait
8faa90fb20 [fix] [minor] add customer_name/supplier_name in sales/purchase register 2013-07-12 17:50:34 +05:30
Nabin Hait
87bed52818 [minor] [fix] get_query for cost center 2013-07-12 16:55:03 +05:30
Anand Doshi
34736c8d87 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
 2013-07-11 18:29:32 +05:30
Anand Doshi
946e0de0cf [minor] [fix] 2013-07-11 18:26:00 +05:30
Nabin Hait
cfecd2bc16 [fix] [cleanup] fixes while testing and code cleanup 2013-07-11 17:49:18 +05:30
Rushabh Mehta
df92a553cb [style] Added Icons to Pages 2013-07-11 14:50:43 +05:30
Rushabh Mehta
1bfb6db586 [minor] Bill Date not mandatory in Purchase Invoice 2013-07-11 12:16:59 +05:30
Nabin Hait
d96bfaf6af [fix] get_query where options not mentioned 2013-07-10 20:30:00 +05:30
Nabin Hait
eddd4a1674 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 19:12:14 +05:30
Nabin Hait
a4f0240bfc [conflict] merged for get_query 2013-07-10 19:05:57 +05:30
Rushabh Mehta
ad71473f35 [cleanup] Default Warehouses created on Company creation. Warehouse names have Company abbreviation as suffix 2013-07-10 18:59:55 +05:30
Saurabh
ee85cfd476 get_query to server side 2013-07-10 17:35:14 +05:30
Saurabh
a29b69245e get_query to servet side 2013-07-10 16:06:31 +05:30
Rushabh Mehta
3429b609a7 [feature] [grid] Allow Grid viewable columns to be selected via 'In List View' 2013-07-10 15:03:37 +05:30
Saurabh
86408c3d44 queries to server side 2013-07-10 14:00:37 +05:30
Saurabh
f52dc07a58 queries to server side 2013-07-10 13:07:49 +05:30
Rushabh Mehta
f9404ba89f [feature] Added Section Breaks to Grids for better visual hierarchy 2013-07-10 12:07:45 +05:30
Saurabh
2e3c06e66d [get_query]to server side 2013-07-09 18:20: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
Anand Doshi
1357c0b2df [cleanup] #402 changed fieldname company_name to company in Cost Center 2013-07-09 15:45:38 +05:30
Nabin Hait
5c33e59e7a [fix][report] sales/purchase register, same accounts as income and tax account 2013-07-09 15:38:40 +05:30
Anand Doshi
c120776931 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	buying/doctype/purchase_order_item/purchase_order_item.txt
 2013-07-09 13:10:15 +05:30
Anand Doshi
bdee6e074a [cleanup] moved company to top section, hide company if only one exists, changed field labels 2013-07-09 13:03:39 +05:30
Nabin Hait
3b999225ba [validation] over billing against DN/PR 2013-07-09 12:35:52 +05:30
Nabin Hait
e03e38db1e Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-09 11:36:41 +05:30
Nabin Hait
253de859b4 [fixes] for testcases 2013-07-09 11:36:00 +05:30
Rushabh Mehta
8f050f4cd3 [sales invoice] payment section visible only if is_pos is true #382 2013-07-09 11:28:47 +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
Anand Doshi
6172b6ffb8 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-08 19:47:55 +05:30
Nabin Hait
a131c0aa5e [fixed conflict] 2013-07-08 19:01:41 +05:30
Nabin Hait
2bd37771ca validate with prevdoc 2013-07-08 19:00:29 +05:30
Anand Doshi
615701d3ae Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 
Conflicts:
	stock/doctype/material_request/material_request.txt
 2013-07-08 18:54:00 +05:30
Anand Doshi
4ee647e84c [bean] [mandatory] fixes in test cases 2013-07-08 18:50:45 +05:30
Saurabh
028755941e get_query to server side 2013-07-08 18:45:55 +05:30
Rushabh Mehta
7eee8531b2 [mapper-pull] for sales / purchae 2013-07-08 18:03:40 +05:30
Rushabh Mehta
d9e7070f2d [mapper-pull] for sales / purchae 2013-07-08 18:01:46 +05:30
Rushabh Mehta
11eda08cd5 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-08 12:40:06 +05:30
Rushabh Mehta
436467a5c9 [purchase order] tests pass 2013-07-08 12:37:59 +05:30
Anand Doshi
0f21b324c9 Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	patches/patch_list.py
 2013-07-08 11:53:35 +05:30
Nabin Hait
1daad6b1ca [report] added some extra columns 2013-07-08 11:28:59 +05:30
Rushabh Mehta
a2a1ec765b [mappers] cleanup, remove dt_map, map_doclist and other such functions 2013-07-08 11:08:27 +05:30
Nabin Hait
a5be5c41cc [mapper] 2013-07-07 11:28:17 +05:30
Rushabh Mehta
8f48db33d2 [sales invoice] added progress bar of payment 2013-07-05 16:54:40 +05:30
Rushabh Mehta
f7de376932 [sales invoice] added progress bar of payment 2013-07-05 16:50:43 +05:30
Nabin Hait
1bec8012d2 [conflict] fixed 2013-07-05 15:25:58 +05:30
Nabin Hait
eb883ee7a3 [mapper] purchase cycle 2013-07-05 15:23:47 +05:30
Rushabh Mehta
11d688a536 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-05 15:14:15 +05:30
Rushabh Mehta
3a3c2710d1 [icon] added in doctype 2013-07-05 15:13:31 +05:30
Anand Doshi
ef8d3bcb77 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-05 12:57:41 +05:30
Anand Doshi
901773a139 [fresh install] [fix] replace allow roles with explicit has_permission checks for doctype py files 2013-07-05 12:57:03 +05:30
Rushabh Mehta
54352c7140 [form cleanup] 2013-07-05 12:43:59 +05:30
Rushabh Mehta
8005362c6c Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-05 10:51:51 +05:30
Rushabh Mehta
e953f0bb97 [form cleanup] journal voucher, purchase invoice, sales invoice, delivery note, item, purchase receipt 2013-07-05 10:48:35 +05:30
Nabin Hait
44935e4608 [fixed conflict] 2013-07-05 10:26:29 +05:30
Anand Doshi
0b4943cec1 [webshop] shopping cart with shipping rule selector, totals 2013-07-04 23:45:22 +05:30
Anand Doshi
a749996747 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-04 18:30:44 +05:30
Anand Doshi
f4d8d23241 [setup] [fix] creation of fiscal year if start date is 1st Jan 2013-07-04 18:29:55 +05:30
Nabin Hait
bc9cf1549f Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-04 17:56:51 +05:30
Nabin Hait
151b0bd153 [merge conflict] 2013-07-04 17:56:28 +05:30
Nabin Hait
df1fca9f65 [mapper] material request to purchase order 2013-07-04 17:50:06 +05:30
Rushabh Mehta
8fe97fcbe1 [mapper] sales order-sales invoice 2013-07-04 17:31:06 +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
Nabin Hait
9010f92eab Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-04 16:03:24 +05:30
Nabin Hait
19f2396f95 Update Purchase Receipt-Purchase Invoice.txt 2013-07-04 14:56:50 +05:30
Nabin Hait
7dc77f764f Update Purchase Order-Purchase Invoice.txt 2013-07-04 14:56:29 +05:30
Nabin Hait
e2dd800999 Update purchase_register.py 2013-07-04 14:37:58 +05:30
Rushabh Mehta
bcff7dce8e [cleanup] [stock entry] [sales order] 2013-07-03 18:32:29 +05:30
Nabin Hait
18f754d53c Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-03 13:31:15 +05:30
Rushabh Mehta
9a04b19160 [form] [legacy-js] removed old Dialog, PageHeader etc., cleanup Opportunity and Quotation 2013-07-03 13:27:39 +05:30
Nabin Hait
72abfa6b4b Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-03 11:48:10 +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
Nabin Hait
71c3f95098 Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-01 18:28:26 +05:30
Rushabh Mehta
d420401ba3 [moduleview] added top bar 2013-07-01 17:15:23 +05:30
Rushabh Mehta
4cd0a07290 [grid-reports] [page] bug fix for double 'show' call, fixed ledger reports links 2013-07-01 15:17:36 +05:30
Rushabh Mehta
36af6a02ad [grid reports] now show by wn.route_options 2013-07-01 14:35:57 +05:30
Rushabh Mehta
e0117896d4 [print] fix wnframework #192, fix in journal voucher 2013-07-01 12:59:22 +05:30
Nabin Hait
fdbfe1c274 Merge branch 'responsive' of git://github.com/webnotes/erpnext into responsive 2013-07-01 12:20:19 +05:30
Nabin Hait
b5e58ffa26 [rename with merge] updated on_rename function for item, warehouse, al tree type documents 2013-07-01 12:20:00 +05:30
Rushabh Mehta
b3f947aca6 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-01 09:36:39 +05:30
Rushabh Mehta
8706ca9445 [journal voucher] [added opening entry] [cleanups] 2013-07-01 09:36:03 +05:30
Anand Doshi
4bef02e46a [minor] removed debug 2013-06-28 19:21:44 +05:30
Saurabh
d6cc5cd08f [Trends Teports] cleanup 2013-06-28 10:09:46 +05:30
Nabin Hait
d122bf51cb Merge branch 'master' of github.com:webnotes/erpnext 2013-06-27 12:22:12 +05:30
Nabin Hait
c35dd968af [fix] invoice with zero values 2013-06-27 12:21:34 +05:30
Anand Doshi
77cd10b10a [selling] added shipping rule link besides taxes master link field 2013-06-27 12:17:34 +05:30
Akhilesh Darjee
f1845cf7c9 Removed errprint from purchase register 2013-06-27 11:06:11 +05:30
Akhilesh Darjee
16c06dc713 Merge branch 'master' of https://github.com/webnotes/erpnext 2013-06-27 11:02:22 +05:30
Akhilesh Darjee
f47617c6e6 [Fix] Purchase Register 2013-06-27 11:01:36 +05:30
Nabin Hait
4924a9f764 [fix] payment reconciliation tool 2013-06-27 11:01:14 +05:30
Akhilesh Darjee
89bd216a0c [Fix] SMS Center 2013-06-26 18:28:54 +05:30
Anand Doshi
922bb1af46 [shipping rule] validations and test cases 2013-06-26 17:14:40 +05:30
Anand Doshi
70902da4da Merge branch 'master' of github.com:webnotes/erpnext into responsive 
Conflicts:
	patches/december_2012/deprecate_tds.py
	patches/june_2012/reports_list_permission.py
	selling/doctype/sales_bom/locale/_messages_doc.json
	selling/doctype/sales_bom/locale/ar-doc.json
	selling/doctype/sales_bom/locale/de-doc.json
	selling/doctype/sales_bom/locale/es-doc.json
	selling/doctype/sales_bom/locale/fr-doc.json
	selling/doctype/sales_bom/locale/hi-doc.json
	selling/doctype/sales_bom/locale/hr-doc.json
	selling/doctype/sales_bom/locale/nl-doc.json
	selling/doctype/sales_bom/locale/pt-BR-doc.json
	selling/doctype/sales_bom/locale/pt-doc.json
	selling/doctype/sales_bom/locale/sr-doc.json
	selling/doctype/sales_bom/locale/ta-doc.json
	selling/doctype/sales_bom/locale/th-doc.json
	selling/doctype/sales_bom_item/locale/_messages_doc.json
	selling/doctype/sales_bom_item/locale/ar-doc.json
	selling/doctype/sales_bom_item/locale/de-doc.json
	selling/doctype/sales_bom_item/locale/es-doc.json
	selling/doctype/sales_bom_item/locale/fr-doc.json
	selling/doctype/sales_bom_item/locale/hi-doc.json
	selling/doctype/sales_bom_item/locale/hr-doc.json
	selling/doctype/sales_bom_item/locale/nl-doc.json
	selling/doctype/sales_bom_item/locale/pt-BR-doc.json
	selling/doctype/sales_bom_item/locale/pt-doc.json
	selling/doctype/sales_bom_item/locale/sr-doc.json
	selling/doctype/sales_bom_item/locale/ta-doc.json
	selling/doctype/sales_bom_item/locale/th-doc.json
 2013-06-26 14:07:29 +05:30
Anand Doshi
8bef70cceb Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-26 13:53:17 +05:30
Anand Doshi
bd7218979e [shipping rule] added doctypes shipping rule and shipping rule conditions 2013-06-26 13:53:01 +05:30
Akhilesh Darjee
4c819edf24 [Report] Added rounded_total & outstanding_amount to Sales & Purchase Register 2013-06-26 11:28:53 +05:30
Nabin Hait
df6ad717b2 Merge pull request #517 from akhileshdarjee/master 
[Report] Cleanup of Territory Target Variance, Sales Person Target Variance, Budget Variance Report & Item Prices
 2013-06-25 02:53:58 -07:00
Nabin Hait
cca41a172c [fix][report] general ledger 2013-06-25 14:14:32 +05:30
Nabin Hait
909e8b120f [fix][report] general ledger 2013-06-25 14:08:18 +05:30
Rushabh Mehta
d242a8babd [patch] breakup global defaults 2013-06-25 11:46:07 +05:30
Akhilesh Darjee
78e622ef5c Deleted search criteria 2013-06-25 11:08:19 +05:30
Rushabh Mehta
7a93d5de30 [bug fixes] [global defaults] [cleanup] 2013-06-24 18:18:46 +05:30
Nabin Hait
3e8eca35a2 [report][fix] stock balance 2013-06-24 17:18:24 +05:30
Rushabh Mehta
7925bd7079 [merge] 2013-06-24 15:47:02 +05:30
Rushabh Mehta
847cfe2b07 [docs] [setup] cleanup 2013-06-24 15:43:18 +05:30
Nabin Hait
82366d3bb8 [report] deleted old reports based on search_criteria 2013-06-24 14:31:56 +05:30
Saurabh
7bfb2b6814 Merge branch 'responsive' of https://github.com/webnotes/erpnext into responsive 2013-06-24 14:10:36 +05:30
Nabin Hait
8b96ba1da6 [general ledger] group by voucher 2013-06-24 13:54:16 +05:30
Nabin Hait
4cd977a2a9 [fixes] pull previous doc details 2013-06-24 12:20:35 +05:30
Nabin Hait
65f038c926 [fixes] pull previous doc details 2013-06-24 11:59:37 +05:30
Anand Doshi
61a2f68bc6 [webshop] territories in price list, taxes, updates in shopping cart settings 2013-06-21 17:55:31 +05:30
Nabin Hait
8086125705 Merge pull request #513 from saurabh6790/master 
Trends Analyzer's Cleanup Complete
 2013-06-21 03:37:59 -07:00
Nabin Hait
f78d16cca1 [general ledger] group by voucher option 2013-06-21 15:13:49 +05:30
Akhilesh Darjee
64c8e28423 [Fixed] Merge conflict fixed 2013-06-21 13:09:18 +05:30
Akhilesh Darjee
1ded5c618e [Report]Cleanup of territory target variance, sales person target variance & budget variance reports 2013-06-21 12:47:51 +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
f8f68c54d9 [trends analyzer] cleanup completed 2013-06-20 18:52:31 +05:30
Nabin Hait
0930b94264 [target report] cleanup 2013-06-20 16:35:09 +05:30
Akhilesh Darjee
e6974d10c2 Fixed conflict merge 2013-06-20 15:22:04 +05:30
Akhilesh Darjee
92571c6929 [Report] Completed Budget variance Report and corrections in Territory Target Varinace & Sales Person Target Variance Report 2013-06-19 18:15:20 +05:30
Akhilesh Darjee
4ddc2618e8 [Report] Completed Sales Person Target Variance (Item-Group wise) 2013-06-18 18:46:02 +05:30
Rushabh Mehta
64c2764b56 [translations/build] deleted translation files (to be built on demand) 2013-06-17 11:56:41 +05:30
Saurabh
feb8669cbd [Reports][Validation changes in Purchase and Sales trends] 2013-06-14 17:40:48 +05:30
Saurabh
606d8383ff Merge branch 'master' of https://github.com/webnotes/erpnext 2013-06-14 16:48:41 +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
Rushabh Mehta
798262d09b [docs] [fixes] fixes to link selection, attachment exception, pageview 2013-06-14 11:33:01 +05:30
Saurabh
0326f5414e [reports][purchase and sales trends] 2013-06-13 19:17:56 +05:30
Saurabh
f9966f44cd [Report][Quotation Trend Complete] 2013-06-12 17:55:19 +05:30
Anand Doshi
9c901e75cd [sales invoice] [cleanup] removed basic info section 2013-06-12 15:28:45 +05:30
Saurabh
bcbd9a4800 [Report][Quotation Trend] 2013-06-11 18:06:58 +05:30
Anand Doshi
b893b4c081 Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-06-11 17:56:55 +05:30
Anand Doshi
0865f60673 [chart of accounts/cost center] [fix] check permission before enabling add child 2013-06-11 17:48:59 +05:30
Anand Doshi
3daf45fcd8 Merge branch 'master' of github.com:webnotes/erpnext into responsive 2013-06-11 17:34:18 +05:30
Anand Doshi
2e0cc41fc6 [chart of accounts/cost center] [add account/cost center] fix in permission issue 2013-06-11 17:33:37 +05:30
Anand Doshi
b53b9dcff4 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-11 16:23:45 +05:30
Anand Doshi
27e6f13b5d [cleanup] deprecated search criteria, amendment_date, cancel_reason 2013-06-11 16:23:18 +05:30
Rushabh Mehta
94acdca8d1 [docs] added docs for accounts 2013-06-11 16:06:37 +05:30
Rushabh Mehta
7a22616d71 [cleanup] GL Control, Multi Ledger Report Detail, Trend Analyzer Control 2013-06-11 16:05:56 +05:30
Anand Doshi
618edee8b7 [search criteria] [cleanup] removed search criteria folders and files 2013-06-11 15:04:37 +05:30
Anand Doshi
49af8754d5 [auto inventory accounting] [general ledger entry] calculate valuation amount without rounding 2013-06-11 12:40:46 +05:30
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
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