Commit Graph

7323 Commits

Author SHA1 Message Date
Nabin Hait
a37ff498fe Merge branch 'master' of github.com:webnotes/erpnext 2013-10-01 18:14:49 +05:30
Nabin Hait
cf3011839f [fix] [minor] bind onclick function based on docstatus in pos 2013-10-01 18:14:16 +05:30
Anand Doshi
b6177cbb5b [minor] change filename to unicode after os.walk and os.listdir 2013-10-01 17:11:39 +05:30
Nabin Hait
49e71400ac [patch] [minor] fix wrong customers in pos 2013-10-01 15:20:06 +05:30
Nabin Hait
cde7f829d6 Merge branch 'master' of github.com:webnotes/erpnext 2013-10-01 11:23:22 +05:30
Nabin Hait
d780baeacc [fix] [minor] fixes in old patch 2013-10-01 11:22:51 +05:30
Nabin Hait
a3e9d0a83d Merge pull request #921 from akhileshdarjee/master
[fix] [minor] new grid to hide delete button on new row & added description
2013-09-30 22:30:15 -07:00
Akhilesh Darjee
67a9ea6800 [price_list] [minor] move header of new grid to right if currency 2013-09-30 19:05:36 +05:30
Akhilesh Darjee
4233ae2258 [pos] pos related fixes 2013-09-30 18:18:19 +05:30
Nabin Hait
263b25c217 Merge branch 'master' of github.com:webnotes/erpnext 2013-09-30 17:58:38 +05:30
Nabin Hait
cadc6e1b2b [fix] [minor] dont call is_pos trigger in onload of pos invoice 2013-09-30 17:57:37 +05:30
Nabin Hait
300ae0cdf4 [fix] [minor] dont call is_pos trigger in onload of pos invoice 2013-09-30 17:57:22 +05:30
Akhilesh Darjee
eb8753e8b6 [fix] [minor] new grid to hide delete button on new row & added description 2013-09-30 15:56:36 +05:30
Nabin Hait
238f56480c Merge pull request #920 from akhileshdarjee/master
[price_list] [minor] fix of new grid
2013-09-30 03:17:11 -07:00
Akhilesh Darjee
9cb2cdbce6 [price_list] [minor] fix of new grid 2013-09-30 15:43:00 +05:30
Nabin Hait
b8ef5a3fe3 Merge pull request #917 from fogueri/master
[docs] new pages on doctype and markup
2013-09-30 01:38:56 -07:00
Nabin Hait
aaa6c99f56 Merge pull request #918 from akhileshdarjee/master
[price_list] new grid for price list
2013-09-30 01:38:27 -07:00
Akhilesh Darjee
7d36fc821b [fix] [minor] new grid fix to hide other grid 2013-09-30 12:44:00 +05:30
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
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
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
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
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