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

7270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Akhilesh Darjee
d086d724b6 [price_list] new grid finished with fixes 2013-09-30 11:37:44 +05:30
Akhilesh Darjee
ff15367a1d Merge branch 'master' of github.com:webnotes/erpnext 2013-09-30 11:35:36 +05:30
Priya
d1972dd4ca [docs] new pages on doctype and markup 2013-09-30 10:44:13 +05:30
Akhilesh Darjee
2ba61236c1 [price list] make new grid 2013-09-27 21:08:37 +05:30
Nabin Hait
a3d12bde9d [fix] [minor] gross profit report 2013-09-27 16:33:22 +05:30
Anand Doshi
8db093b4c6 [minor] update password 2013-09-27 14:08:55 +05:30
Nabin Hait
164d39d12f Merge pull request #883 from akhileshdarjee/master 
[feature] pos view added in all sales & purchase cycle
 2013-09-27 00:05:15 -07:00
Akhilesh Darjee
2428e8d1b7 [pos] [minor] fix for cur_frm 2013-09-27 12:32:26 +05:30
Nabin Hait
f6dd28c157 Merge pull request #905 from MaxMorais/patch-1 
Fix Translation in Sales Order.js
 2013-09-26 23:02:45 -07:00
Nabin Hait
f72bd2c196 Merge pull request #907 from MaxMorais/patch-3 
Fix translation in Customer.js
 2013-09-26 22:59:01 -07:00
Maxwell
18762925bc Fix translation in Customer.js 
I'll be fixing some points that I miss translation.
 2013-09-26 17:54:46 -03:00
Maxwell
6111b1edb6 Fix Translation in Sales Order.js 
I'll be fixing some points that I miss translation.
 2013-09-26 17:49:53 -03:00
Nabin Hait
8096644be8 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-26 18:37:08 +05:30
Nabin Hait
250059097c [fix] [minor] set employee name blank while creating new employee 2013-09-26 18:36:35 +05:30
Nabin Hait
d8fed69e04 Merge pull request #898 from fogueri/master 
stock reconciliation minor
 2013-09-26 05:50:00 -07:00
Nabin Hait
6060cc4896 [fix] [minor] fetch project on selection of task in time log 2013-09-26 17:59:05 +05:30
Anand Doshi
c875300fe2 [minor] moved wn-web.js and wn-web.css to memcache 2013-09-26 17:54:51 +05:30
Nabin Hait
a1f7f2abfd [minor] update lead status as Opportunity Made when opportunity submitted 2013-09-26 16:59:32 +05:30
Nabin Hait
ca77574a66 [fix] [minor] only post sl entries if stock item exists 2013-09-26 16:16:44 +05:30
Anand Doshi
f879a9dc2e [minor] wnf refactor, fixes in demo 2013-09-26 15:56:54 +05:30
Nabin Hait
6ec4b0c52a [fix] [minor] display product image in shopping cart 2013-09-26 15:45:44 +05:30
Nabin Hait
16ec14f9ab [fix] set missing values on creation of stock entry from material request 2013-09-26 14:08:09 +05:30
Nabin Hait
9f28996165 [fix] [minor] retain leave approver after setting options 2013-09-26 12:18:40 +05:30
Nabin Hait
38567e02e1 [fix] [minor] toggle fields based on permission in expense claim 2013-09-26 12:09:17 +05:30
Nabin Hait
16ec981bfd [cleanup] [minor] fetch lead details in opportunity 2013-09-25 20:00:22 +05:30
Nabin Hait
1ec5109a1a Reduce ordered qty in Purchase Receipt based on PO warehouse 2013-09-25 19:58:32 +05:30
Anand Doshi
5b004ff8a7 Merge branch 'master' of github.com:webnotes/erpnext into wsgi 
Conflicts:
	accounts/doctype/account/account.py
	accounts/doctype/gl_entry/gl_entry.py
	accounts/doctype/period_closing_voucher/period_closing_voucher.py
	stock/doctype/delivery_note/delivery_note.py
	stock/doctype/landed_cost_wizard/landed_cost_wizard.py
	stock/doctype/purchase_receipt/purchase_receipt.py
	stock/doctype/stock_ledger/stock_ledger.py
	stock/doctype/warehouse/warehouse.py
	stock/stock_ledger.py
 2013-09-25 19:55:41 +05:30
Nabin Hait
7496b528a1 [fix] [minor] validate parent account for warehouse account 2013-09-25 17:32:33 +05:30
Priya
ce94ab87ea [docs] stock reconciliation 2013-09-25 17:20:41 +05:30
Nabin Hait
ee60763b45 [fix] [minor] negative stock balance for batch 2013-09-25 15:59:35 +05:30
Nabin Hait
c6871dc194 [patch] [minor] unsubmit serial nos if submitted 2013-09-25 14:44:06 +05:30
Nabin Hait
a7687e9ab6 [fix] [minor] create default web page only for first company 2013-09-25 13:43:35 +05:30
Nabin Hait
5c464e4a01 [fix] [minor] uom conversion factor mandatory check 2013-09-25 13:24:00 +05:30
Nabin Hait
69a3ee54f2 [fix] [minor] create default warehouse on saving of company if not exists 2013-09-25 13:00:22 +05:30
Nabin Hait
52f6b5a6e8 [fix] [minor] fixes in old patches 2013-09-25 12:52:28 +05:30
Nabin Hait
373b53f222 [fix] [minor] create account for warehouse if not exists with same name 2013-09-25 12:50:46 +05:30
Nabin Hait
c5f9dcfc70 [fix] [minor] fixes in old patches 2013-09-25 12:43:14 +05:30
Pratik Vyas
a80f2e4431 refactor site_path 2013-09-25 12:40:33 +05:30
Pratik Vyas
abf62eacca Merge branch 'wsgi' of github.com:webnotes/erpnext into wsgi 2013-09-25 12:40:16 +05:30
Nabin Hait
4a1008829b [fix] [minor] fixes in old patches 2013-09-25 12:37:13 +05:30
Nabin Hait
37ba2a2486 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-25 12:17:47 +05:30
Nabin Hait
cdf453fbee Merge pull request #896 from fogueri/master 
Docs
 2013-09-24 23:46:35 -07:00
Nabin Hait
98b6c35265 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-25 12:10:23 +05:30
Priya
500cb6c008 [docs ]minor perpetual inventory page 2013-09-25 11:59:04 +05:30
Anand Doshi
2ad07e1cc1 [minor] [fix] approval status of expense claim to be editable only after first save 2013-09-25 11:42:46 +05:30
Akhilesh Darjee
10dce341c8 [pos] pos view fixed for all purchase & sales cycle 2013-09-25 11:09:33 +05:30
Nabin Hait
625da79e9f item-wise price list rate, editable report 2013-09-25 10:32:51 +05:30
Anand Doshi
de8b6aadaf [minor] fixes for import conf 2013-09-24 17:17:39 +05:30
Priya
bb05d2970d [docs] accounting page created 2013-09-24 16:34:22 +05:30
Nabin Hait
04a3feecf6 [minor] perpetual inventory fix 2013-09-24 15:16:01 +05:30