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

159 Commits

Author SHA1 Message Date
Nabin Hait
20dc79ac99 General ledger filter by account group 2013-12-23 17:06:10 +05:30
Nabin Hait
2a9e4e9a32 Opening and closing balance in general ledger report 2013-12-19 19:11:53 +05:30
Nabin Hait
57e89ff6f1 [reports] general ledger: grid report to script report 2013-12-17 16:09:21 +05:30
Nabin Hait
ea4f66791e Merge branch 'develop' of github.com:webnotes/erpnext into reports 2013-12-16 15:18:34 +05:30
Akhilesh Darjee
229b246d6d [fix] [minor] production planning tool clear sales order table 2013-12-11 18:49:11 +05:30
Nabin Hait
4a8930fc67 [report]general ledger report migrated to script report 2013-12-06 18:07:23 +05:30
Nabin Hait
c313ca99ff [report]general ledger report migrated to script report 2013-12-06 16:36:23 +05:30
Pratik Vyas
1417c6d58f [hotfix] fix null issue in budget variance 2013-12-06 14:50:06 +05:30
Akhilesh Darjee
9c0569ee2d [report] payment collection with ageing and payment made with ageing merged to payment period based on invoice date 2013-12-02 17:58:23 +05:30
Nabin Hait
752bdbacaf Merge branch '1310' of github.com:webnotes/erpnext 2013-11-27 17:31:04 +05:30
Nabin Hait
a07a5084c1 Update payment_made_with_ageing.py 2013-11-27 12:05:32 +05:30
Nabin Hait
a967100990 Update payment_collection_with_ageing.py 2013-11-27 12:05:15 +05:30
Akhilesh Darjee
ca414a96cc [fix] [minor] ageing related reports fixed 2013-11-27 11:53:57 +05:30
Nabin Hait
55afd2620e Merge branch 'master' of github.com:webnotes/erpnext 2013-11-21 12:41:37 +05:30
Nabin Hait
8eb0c61649 [minor] merge conflict fixed 2013-11-21 12:28:50 +05:30
https://github.com/account/admin
4a54aec493 Updated Accounts receivable report 
-Modified the columns a bit
-Added link to the customer column (was missing earlier)
-Added a link for the transactions (it is very necessary)
 2013-11-20 22:48:56 +05:30
Akhilesh Darjee
20f93546eb [fix] [minor] all variance related reports fixed 2013-11-20 13:25:04 +05:30
Rushabh Mehta
ad45e31356 [copyright] added Contributors 2013-11-20 13:00:28 +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
Akhilesh Darjee
d2d210dc68 [fix] [minor] variance reports fixes 2013-11-13 17:27:35 +05:30
Akhilesh Darjee
bfe264be8c [fix] [minor] all types of variance reports fixed 2013-11-13 16:45:11 +05:30
Nabin Hait
49f2bafa0f [fix] [minor] budget variance report logic + loading time 2013-11-13 15:32:12 +05:30
Nabin Hait
06da1a6147 Merge pull request #1029 from akhileshdarjee/1310 
[fix] [minor] budget variance report fixed
 2013-11-11 21:57:22 -08:00
Akhilesh Darjee
fbfefd3dcd [fix] [minor] budget variance report fixed 2013-11-12 11:24:56 +05:30
Nabin Hait
e587bc3024 Update accounts_payable.py 2013-11-11 18:42:22 +05:30
Nabin Hait
113b4c1a21 [fix] [minor] accounts payable ageing data 2013-11-11 18:25:12 +05:30
Anand Doshi
c89b49c322 Merge remote-tracking branch 'origin/1310' 2013-11-11 13:45:19 +05:30
Akhilesh Darjee
7344353ac5 [report] [fix] accounts payable fixed for get_ageing_date() 2013-11-11 12:47:49 +05:30
Anand Doshi
0516fc6161 Merge branches '1310' and 'master' of github.com:webnotes/erpnext 2013-11-07 21:10:38 +05:30
Anand Doshi
ce7ed98e31 [minor] [refactor] Accounts Receivable 2013-11-07 21:09:44 +05:30
Anand Doshi
aacbe7a277 Merge branches '1310' and 'master' of github.com:webnotes/erpnext 2013-11-07 21:04:36 +05:30
Anand Doshi
3990104e9b [minor] [refactor] Accounts Receivable 2013-11-07 21:04:01 +05:30
Anand Doshi
ed1679a1c5 Merge branch '1310' of github.com:webnotes/erpnext 2013-11-07 20:49:13 +05:30
Anand Doshi
9ff22fd508 [minor] [refactor] Accounts Receivable 2013-11-07 20:44:30 +05:30
Anand Doshi
daaa14c079 Merge branch '1310' of github.com:webnotes/erpnext 
Conflicts:
	setup/doctype/setup_control/setup_control.py
	stock/doctype/stock_entry/stock_entry.py
	utilities/demo/demo_docs/Price_List.csv
 2013-11-04 13:14:39 +05:30
Nabin Hait
4144b1c841 [fix] [minor] itemwise sales/purchase register 2013-11-01 18:08:55 +05:30
Nabin Hait
ca8ad210d2 Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n 2013-10-24 11:40:32 +05:30
Nabin Hait
5566bcaa0e [cleanup] purchase common 2013-10-18 17:01:56 +05:30
Bárbara Perretti
4b41e5f7f7 Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n 
Conflicts:
	accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
	accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
	public/js/complete_setup.js
	selling/doctype/opportunity/opportunity.js
	selling/doctype/quotation/quotation.js
 2013-10-16 15:09:18 -03:00
Anand Doshi
373680bbae Merged master into wsgi 2013-10-10 16:04:40 +05:30
Nabin Hait
6ec7d9d3f9 [fix] [minor] item-wose tax in item-wise sales register 2013-10-09 11:46:50 +05:30
Bárbara Perretti
48dbeb63b8 Fix translate sales_register.js 2013-09-30 18:21:02 -03:00
Bárbara Perretti
35fe5faba5 Fix translate purchase_register.js 2013-09-30 18:19:58 -03:00
Bárbara Perretti
2fec756fde Fix translate payment_made_with_ageing.js 2013-09-30 18:19:03 -03:00
Bárbara Perretti
e696cd0b6c Fix translate payment_collection_with_ageing.js 2013-09-30 18:17:35 -03:00
Bárbara Perretti
aa83cd0394 Fix translate item_wise_sales_register.js 2013-09-30 18:14:43 -03:00
Bárbara Perretti
40c98fb795 Fix translate item_wise_purchase_register.js 2013-09-30 18:13:24 -03:00
Bárbara Perretti
c685da0061 Fix translate gross_profit.js 2013-09-30 18:11:48 -03:00
Bárbara Perretti
2d3041e8ae Fix translate budget_variance_report.js 2013-09-30 18:10:04 -03:00
Bárbara Perretti
2d393e36a5 Fix translate bank_reconciliation_statement.js 2013-09-30 18:08:50 -03:00