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

229 Commits

Author SHA1 Message Date
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
8706ca9445 [journal voucher] [added opening entry] [cleanups] 2013-07-01 09:36:03 +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
bd7218979e [shipping rule] added doctypes shipping rule and shipping rule conditions 2013-06-26 13:53:01 +05:30
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
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
Nabin Hait
8b96ba1da6 [general ledger] group by voucher 2013-06-24 13:54:16 +05:30
Nabin Hait
f78d16cca1 [general ledger] group by voucher option 2013-06-21 15:13:49 +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
Akhilesh Darjee
e6974d10c2 Fixed conflict merge 2013-06-20 15:22:04 +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
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
798262d09b [docs] [fixes] fixes to link selection, attachment exception, pageview 2013-06-14 11:33:01 +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
Rushabh Mehta
94acdca8d1 [docs] added docs for accounts 2013-06-11 16:06:37 +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
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
196b6b8b68 [report] itemwise sales register 2013-06-05 16:12:42 +05:30
Nabin Hait
90202aec2b [merge conflict] 2013-06-05 12:37:10 +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
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
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
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
9fce94ff96 [report] reports link added into accounts home page 2013-05-28 17:12:15 +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
Rushabh Mehta
4a2f0f8c36 [js-libs] upgraded to latest bootstrap and font-awesome 2013-05-22 11:57:05 +05:30
Rushabh Mehta
f514998011 merge 2013-05-09 11:42:35 +05:30
Nabin Hait
a55723bea2 [report] sales partners commission 2013-05-06 12:46:07 +05:30
Rushabh Mehta
d3e00995db [conflicts] [merged] 2013-05-02 16:02:59 +05:30
Nabin Hait
4d7a1c1f35 [script report] payments made with ageing 2013-05-02 15:19:00 +05:30
Nabin Hait
d7889cd5d5 [script report] payment collection with ageing 2013-05-02 12:14:59 +05:30
Nabin Hait
e388465e17 [script report] bank clearance summary 2013-05-01 12:23:07 +05:30
Nabin Hait
76646fb279 [script report] bank reconciliation statement in new style 2013-05-01 11:23:44 +05:30
Nabin Hait
98cfe688a8 [script report] purchase register in new style 2013-04-30 17:22:43 +05:30
Nabin Hait
99883420e7 [general ledger][fixes] for against_account value 2013-04-29 12:17:05 +05:30
Rushabh Mehta
e0ec7b0330 Merge branch 'master' into responsive 2013-04-26 15:41:20 +05:30
Nabin Hait
5c2cb74e7a [script report] sales register migrated into new script report 2013-04-24 15:46:09 +05:30
Rushabh Mehta
f1cfbeaa5c [merge] fix 2013-04-24 10:03:56 +05:30
Nabin Hait
ebd514442a [script report] accounts payable migrated to new style 2013-04-23 15:36:26 +05:30
Nabin Hait
e7366f763b [report] accounts receivable migrated into new style 2013-04-22 13:14:52 +05:30
Rushabh Mehta
cc32b65b66 [toolbars] [design] commonified into common toolbar 2013-04-19 13:01:32 +05:30
Rushabh Mehta
d6c8235fb5 [style] [upgrade] moved to bootstrap 3 2013-04-18 17:43:21 +05:30
Rushabh Mehta
651ce05fcc [merge master 
]
 2013-04-18 10:37:16 +05:30
Rushabh Mehta
ac118c8822 [cleanup] started responsive layouts and removed tinymce 2013-04-15 17:02:20 +05:30
Anand Doshi
b094ae7f23 [general ledger] [fix] renamed function 2013-04-12 20:19:10 +05:30
Nabin Hait
54cab9cded [fixes] fixes in general ledger grid report 2013-04-10 16:04:18 +05:30
Rushabh Mehta
e9ef6be57f [rename] [feature] added merge feature to rename_doc 2013-03-26 17:15:49 +05:30
Rushabh Mehta
74506e96d3 [profile/email] [feature] added option not to send print as email body. fix in profile delete 2013-03-25 17:52:14 +05:30
Anand Doshi
080f9098c0 deprecated sales and purchase return tool 2013-03-18 17:57:59 +05:30
Anand Doshi
f55922e962 fix in chart of accounts balance display 2013-03-13 12:53:00 +05:30
Anand Doshi
b96fef9802 remove cancelled entries from grid report when fetching data based on modified 2013-03-07 15:35:36 +05:30
Nabin Hait
87b9cd5ba1 use get_global_default instead of control panel 2013-03-06 13:15:08 +05:30
Nabin Hait
acd52a021b Merge branch 'master' of github.com:webnotes/erpnext 2013-03-05 18:23:50 +05:30
Nabin Hait
46043f2d94 messages updated in voucher import tool 2013-03-05 18:23:34 +05:30
Anand Doshi
b343a4895c fix in empty col check in voucher import tool 2013-03-05 17:24:15 +05:30
Anand Doshi
18c1980e38 voucher import tool - throw message if empty columns are found 2013-03-05 14:44:05 +05:30
Nabin Hait
1ead851e16 datatype validation in voucher import tool 2013-03-01 13:21:29 +05:30
billyfordson
9b352309c6 Adding German translation 2013-02-27 17:36:23 +01:00
Rushabh Mehta
29786e38df added get_value, fixed appframe from Single 2013-02-26 14:27:03 +05:30
Nabin Hait
6dfa84164e fixes in new gross profit report 2013-02-25 18:57:41 +05:30
Rushabh Mehta
e4eb89b02a added new language and filters in query reports 2013-02-25 13:00:16 +05:30
Rushabh Mehta
f41dd39286 added language 2013-02-21 16:57:54 +05:30
Rushabh Mehta
2fe861fa71 defaults cleanup 2013-02-19 15:54:15 +05:30
Rushabh Mehta
5117d9c266 refactored defaults, bin material request wip 2013-02-19 15:27:31 +05:30
Rushabh Mehta
c53231a841 model_wrapper is now bean, refactoring defaults 2013-02-18 18:24:28 +05:30
Rushabh Mehta
60135df6fd updated language 2013-02-11 11:44:12 +05:30
Nabin Hait
e343ac7173 fixes in voucher import tool 2013-02-06 18:42:26 +05:30
Nabin Hait
fb3fd6e3e5 deprecated gl_control and some rewrites 2013-01-30 19:16:13 +05:30
Anand Doshi
55b93764b4 Merge branch 'master' of github.com:webnotes/erpnext 2013-01-29 17:05:42 +05:30
Anand Doshi
763fcf735d removed Accounts User role for accounts report pages 2013-01-29 17:05:00 +05:30
Nabin Hait
53e36b34d3 fixed syntax issue in financial statements 2013-01-29 10:47:58 +05:30
Rushabh Mehta
cda5d42a65 updated languages 2013-01-28 14:21:40 +05:30
Rushabh Mehta
8e3affbf70 added nl 2013-01-25 11:58:18 +05:30
Rushabh Mehta
4e01011669 added language to pages 2013-01-24 19:31:55 +05:30
Rushabh Mehta
597d470e63 added format_currency and added options to all currency fields 2013-01-23 19:39:51 +05:30
Nabin Hait
025e01322c stock balance report: qty and value in same page, valuation method from item master 2013-01-22 14:03:34 +05:30
Rushabh Mehta
cb46a2df55 accounts_browser: fix for number formatting 2013-01-21 21:58:53 +05:30
Rushabh Mehta
6f9915cd17 install from txt files, part 1 2013-01-16 17:48:17 +05:30
Anand Doshi
6c5262abb1 Merge branch 'master' of github.com:webnotes/erpnext into stock_reco 
Conflicts:
	patches/patch_list.py
	stock/report/stock_ledger/stock_ledger.txt
 2013-01-14 13:28:31 +05:30
Anand Doshi
4d79bfb225 added back Trend Analyzer report to home pages 2013-01-11 19:06:57 +05:30
Anand Doshi
b7d0dcdd14 changed wn.downloadify to wn.tools.downloadify 2013-01-10 14:44:03 +05:30
Rushabh Mehta
846678a1e4 added links to open count in module + other minor fixes 2013-01-10 12:25:25 +05:30
Rushabh Mehta
ce1d5276ff added moduleview 2013-01-09 16:39:27 +05:30
Nabin Hait
e8b7ac1469 opening and closing balance fix in general ledger 2013-01-02 15:11:29 +05:30