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

6706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anand Doshi
47e14a9de4 [fix] [minor] rate calculation on server side, only if blank/0 (honour client side calculation sequence), shopping cart settings 2013-08-13 13:01:12 +05:30
Anand Doshi
c4dde9bd99 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-12 20:13:02 +05:30
Anand Doshi
05a340e764 [fix] [minor] fixes after merging akhilesh's changes 2013-08-12 20:01:55 +05:30
Anand Doshi
9e59aff54e Merge branch 'master' of git://github.com/akhileshdarjee/erpnext into akhileshdarjee-master 
Conflicts:
	accounts/doctype/pos_setting/pos_setting.txt
	patches/patch_list.py
 2013-08-12 20:00:33 +05:30
Nabin Hait
358907d8a6 [fix] [minor] sales invoice: unhide fields if not hidden in database 2013-08-12 19:06:32 +05:30
Nabin Hait
8441a63121 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-12 17:39:51 +05:30
Nabin Hait
f638336886 [fix] [minor] description for period-closing-account field 2013-08-12 17:39:33 +05:30
Anand Doshi
3eb8c38efb Merge branch 'master' of github.com:webnotes/erpnext 2013-08-12 17:33:23 +05:30
Anand Doshi
5476318030 [fix] [minor] round off currency values in grid reports 2013-08-12 17:32:47 +05:30
Nabin Hait
bf5d44c804 [fix] [minor] reorder level bug through scheduler 2013-08-12 16:30:48 +05:30
Nabin Hait
37fe72e4e9 [fix] [minor] Do not validate leave balance if status is Rejected 2013-08-12 15:29:50 +05:30
Nabin Hait
9fa830805e Merge branch 'master' of github.com:webnotes/erpnext 2013-08-12 15:15:34 +05:30
Nabin Hait
d1055ce1bc [fix] [minor] Target variance report if distribution id is not specified 2013-08-12 15:15:19 +05:30
Rushabh Mehta
3e6c423c0b Merge branch 'master' of github.com:webnotes/erpnext 2013-08-12 14:18:47 +05:30
Rushabh Mehta
4c17f9420e [manufacturing] Added New Reports 2013-08-12 14:18:09 +05:30
Anand Doshi
f066f7166b [minor] [fix] [patch] rename price list 2013-08-12 12:29:36 +05:30
Anand Doshi
e42a0222d5 [minor] [fix] precision for float fields on server-side 2013-08-12 11:58:02 +05:30
Anand Doshi
cf2cf3897b [minor] [install] added instruction to set domain for url generation within erpnext 2013-08-09 19:39:09 +05:30
Rushabh Mehta
813b1cba65 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-09 18:12:15 +05:30
Rushabh Mehta
4a404e9299 [price list] Separated Default Price List for Selling and Buying and changed fieldnames 2013-08-09 18:11:35 +05:30
Anand Doshi
43b38dfd71 [cleanup] [minor] wn.ui.toolbar.show_banner 2013-08-09 16:57:53 +05:30
Rushabh Mehta
0b9954059c [cleanup] [minor] price list field rename (wip), set default supplier from item, make demo - purchase cycle (wip) 2013-08-09 15:30:11 +05:30
Rushabh Mehta
be64070ed9 [report] material requests for which supplier quotations are not created 2013-08-09 15:26:47 +05:30
Anand Doshi
1da188ad17 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-09 15:13:53 +05:30
Anand Doshi
b6084f1e78 [fix] [minor] set customer defaults to fetch price list 2013-08-09 15:13:23 +05:30
Nabin Hait
f71f5f55e5 [minor] [fix] update serial no details on cancelling of purchase receipt 2013-08-09 14:46:16 +05:30
Nabin Hait
ceb4d309b5 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-09 13:17:51 +05:30
Nabin Hait
d9ef559f3b [fix] [minor] fix in updating numbering series 2013-08-09 13:17:32 +05:30
Akhilesh Darjee
44b2e23eba [fix] pos settings - replace customer account with customer 2013-08-09 12:43:57 +05:30
Akhilesh Darjee
de7d944f5e [issue] webnotes/erpnext#647 - recurring event for employee birthdays 2013-08-09 12:28:50 +05:30
Anand Doshi
79251492fe [fix] [minor] call set_dynamic_labels after onload_post_render 2013-08-09 00:20:34 +05:30
Anand Doshi
38a07cf86a [fix] [chart of accounts] view ledger should show correct account's ledger 2013-08-08 18:49:58 +05:30
Rushabh Mehta
75c3171c04 [rename] Naming Series is now Document Numbering Series and updated translations 2013-08-08 16:00:40 +05:30
Rushabh Mehta
51ae205e0e Merge branch 'master' of github.com:webnotes/erpnext 2013-08-08 14:17:09 +05:30
Rushabh Mehta
2c968cecf5 [Production Order] [minor] Cleanup 2013-08-08 14:16:39 +05:30
Nabin Hait
3dfc9303ca [minor] [fix] validation in stock reconciliation 2013-08-08 11:29:08 +05:30
Nabin Hait
5230318445 [minor] [fix] make bank voucher form expense claim 2013-08-08 11:28:37 +05:30
Rushabh Mehta
43d7de8cdc Merge branch 'master' of github.com:webnotes/erpnext 2013-08-08 07:41:25 +05:30
Anand Doshi
5a8a63058e Merge branch 'master' of github.com:webnotes/erpnext 2013-08-07 20:19:26 +05:30
Anand Doshi
1c77745d05 [fix] [minor] [print formats] use format_currency in place of fmt_money 2013-08-07 20:15:37 +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
1dbe9a71e5 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-07 17:47:00 +05:30
Rushabh Mehta
7cfefbced5 [bom] [production] Cleaned up BOM, Production Planning Tool, Progress in Demo Builder 2013-08-07 17:46:35 +05:30
Nabin Hait
7c902bb26a Merge branch 'master' of github.com:webnotes/erpnext 2013-08-07 17:32:06 +05:30
Nabin Hait
cf5c9a1f59 [minor] [fix] uom conversion factor should be mapped from PO to PR to PI 2013-08-07 17:31:47 +05:30
Anand Doshi
b0dab89626 [docs] [minor] updated install instructions 2013-08-07 16:32:12 +05:30
Anand Doshi
9113f259bb [fix] [minor] [patch] commit after update qty 2013-08-07 15:19:32 +05:30
Rushabh Mehta
0cb97f3627 Merge branch 'master' of github.com:webnotes/erpnext 2013-08-07 15:08:37 +05:30
Rushabh Mehta
7c2a2e24a2 [demo] [minor] simulate quotation 2013-08-07 15:08:11 +05:30
Rushabh Mehta
0983cb75d5 [cleanup] [minor] removed default value 0.00 2013-08-07 15:06:51 +05:30