Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,689 Commits 3 Branches 0 Tags 1 GiB
d1055ce1bc
Commit Graph

99 Commits

Author SHA1 Message Date
Nabin Hait
d1055ce1bc [fix] [minor] Target variance report if distribution id is not specified 2013-08-12 15:15:19 +05:30
Anand Doshi
5dd6b1d082 [optimization] [minor] pass filtered stock ledger entries to get_buying_amount 2013-08-07 19:27:30 +05:30
Rushabh Mehta
e67d1fbcdf [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
Anand Doshi
6affb78e1f [minor] moved delivered items to be billed to accounts module 2013-08-02 12:50:40 +05:30
Anand Doshi
e5c69133a8 [minor] moved delivered items to be billed to accounts module 2013-08-02 12:45:00 +05:30
Nabin Hait
dbe4d1930b [minor] added customer/supplier id and name in sales/purchase register 2013-08-02 11:20:02 +05:30
Anand Doshi
f006916518 [fix] [minor] [report] 2013-07-31 11:47:54 +05:30
Anand Doshi
5c76f014a7 [report] [accounts] Delivered Items To Be Billed, Received Items To Be Billed 2013-07-30 18:42:16 +05:30
Nabin Hait
114bc09164 [minor] [fix] same account in item and tax table 2013-07-26 15:47:47 +05:30
Nabin Hait
a10ef4592b [minor] total tax column in item-wise sales/purchase register 2013-07-26 15:45:38 +05:30
Anand Doshi
508bd4c7d5 [report] Item-wise Purchase Register [issue] webnotes/erpnext#374 2013-07-26 13:09:40 +05:30
Anand Doshi
ac90542414 [report] Item-wise Sales Register [issue] webnotes/erpnext#372 2013-07-26 13:09:23 +05:30
Anand Doshi
5491332772 [fix] [minor] use wn.defaults.get_default instead of sys_defaults 2013-07-26 13:02:18 +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
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
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
Nabin Hait
8faa90fb20 [fix] [minor] add customer_name/supplier_name in sales/purchase register 2013-07-12 17:50:34 +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
Nabin Hait
2bd37771ca validate with prevdoc 2013-07-08 19:00:29 +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
Nabin Hait
151b0bd153 [merge conflict] 2013-07-04 17:56:28 +05:30
Nabin Hait
e2dd800999 Update purchase_register.py 2013-07-04 14:37:58 +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
Saurabh
d6cc5cd08f [Trends Teports] cleanup 2013-06-28 10:09:46 +05:30
Akhilesh Darjee
f1845cf7c9 Removed errprint from purchase register 2013-06-27 11:06:11 +05:30
Akhilesh Darjee
f47617c6e6 [Fix] Purchase Register 2013-06-27 11:01:36 +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
Akhilesh Darjee
4c819edf24 [Report] Added rounded_total & outstanding_amount to Sales & Purchase Register 2013-06-26 11:28:53 +05:30
Akhilesh Darjee
78e622ef5c Deleted search criteria 2013-06-25 11:08:19 +05:30
Rushabh Mehta
7925bd7079 [merge] 2013-06-24 15:47:02 +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
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
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
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
Saurabh
0326f5414e [reports][purchase and sales trends] 2013-06-13 19:17:56 +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
6164b89e95 [report] listing on home page 2013-06-06 17:18:38 +05:30
Nabin Hait
c36e2653f9 [report] itemwise purchase register 2013-06-05 16:13:05 +05:30