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

9746 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
c25681c36c Added item group and brand in sales-person-wise transaction summary report 2014-09-16 12:28:40 +05:30
Nabin Hait
1aea75261d Merge pull request #2200 from nabinhait/hotfix 
Minor fix
 2014-09-16 11:28:15 +05:30
Nabin Hait
5cd20e3d24 Minor fix 2014-09-16 11:26:53 +05:30
Nabin Hait
9968c7ef70 Merge pull request #2199 from nabinhait/hotfix 
Minor fix
 2014-09-16 11:25:06 +05:30
Nabin Hait
ca260618d8 Minor fix 2014-09-16 11:24:25 +05:30
Anand Doshi
93c2adb2cd Merge pull request #2193 from anandpdoshi/anand-september-15 
Recurring fix, cherry-picked nabin's address template fix
 2014-09-15 13:04:12 +05:30
Anand Doshi
a92c6886cd Merge pull request #2173 from ankitjavalkarwork/fix2043 
Add message on cancel in SI if C-Form exists, fix minor error, Add validation in C-Form
 2014-09-15 12:56:51 +05:30
Anand Doshi
01d171756b [fix] before_recurring, set due_date, ageing_date as None, fixed account due date validation 2014-09-15 12:50:37 +05:30
Nabin Hait
65bef02607 Fixes in address template 2014-09-15 12:18:28 +05:30
Rushabh Mehta
cb9331ddca Merge pull request #2191 from 81552433qqcom/develop 
#2190 hotfix, item page
 2014-09-15 10:13:09 +05:30
81552433qqcom
ac0c3fb696 #2190 hotfix, item page 2014-09-15 10:21:36 +08:00
Anand Doshi
a844fb78bb Merge branch '81552433qqcom-master' into develop 2014-09-12 16:23:08 +05:30
81552433qqcom
6d02939256 changed indent. as well use tab instead of space. 2014-09-12 16:22:28 +05:30
81552433qqcom
e3b63f2d9c added __() for options that need label. 2014-09-12 16:07:12 +05:30
81552433qqcom
1c440b3b31 month options doesn't get translated. 2014-09-12 16:07:12 +05:30
81552433qqcom
c5a0ef8399 fix according to the suggestion. 2014-09-12 16:07:12 +05:30
81552433qqcom
951da0ca3d added translations to report py file. 2014-09-12 16:07:12 +05:30
81552433qqcom
351be9ca42 translations. 2014-09-12 16:07:11 +05:30
81552433qqcom
4bab0a2f54 various translation missed __() 2014-09-12 16:07:11 +05:30
Anand Doshi
97478b746d Merge pull request #2185 from anandpdoshi/ankit-payment-tool 
Payment Tool
 2014-09-12 15:53:03 +05:30
Anand Doshi
61a591944b [minor] ui/ux fixes in Payment Tool 2014-09-12 15:42:16 +05:30
Ankit Javalkar
8e7ca41817 Payment Tool #2106 2014-09-12 15:23:46 +05:30
Anand Doshi
84e08fd534 Merge pull request #2174 from neilLasrado/cost-of-production-cycle-magix 
Cost of Production cycle
 2014-09-12 14:45:19 +05:30
Anand Doshi
b0e56fa1b5 Merge pull request #2181 from nabinhait/hotfix 
Report print format fixed for translated columns
 2014-09-12 14:18:52 +05:30
Neil Trini Lasrado
e7c48ed3b0 bom operation inList view fix 2014-09-12 12:08:02 +05:30
Nabin Hait
c432270ca8 Report print format fixed for translated columns 2014-09-12 12:00:47 +05:30
Neil Trini Lasrado
6a7f75c3e3 Cost of Production cycle 2014-09-12 11:25:03 +05:30
Neil Trini Lasrado
e9882e12ba Cost of Production cycle 2014-09-12 11:25:03 +05:30
ankitjavalkarwork
3df10429db Add message on cancel in SI if C-Form exists, Add validation in C-Form, remove update_c_form 2014-09-11 16:58:18 +05:30
Anand Doshi
eee569bb20 Merge pull request #2177 from anandpdoshi/anand-september-11 
[fix] transfer_qty in get_stock_and_rate
 2014-09-11 16:47:59 +05:30
Anand Doshi
2f9c36a588 Merge pull request #2175 from ankitjavalkarwork/fix2153 
[minor] Add Permission for additional roles to Customer, Supplier
 2014-09-11 16:47:08 +05:30
Anand Doshi
907494c5d4 [fix] transfer_qty in get_stock_and_rate 2014-09-11 16:22:12 +05:30
Anand Doshi
4d2520ea53 Merge pull request #2176 from nabinhait/hotfix 
Opening entry should not be considered in bank reconciliation statement
 2014-09-11 15:21:24 +05:30
Nabin Hait
cece0c7ffe Opening entry should not be considered in bank reconciliation statement 2014-09-11 13:59:00 +05:30
ankitjavalkarwork
5e34383e25 [minor] Add Permission for additional roles to Customer, Supplier 2014-09-10 17:54:42 +05:30
Anand Doshi
8e39ee79b0 Merge pull request #2167 from anandpdoshi/anand-september-9 
Set allow_on_submit for 'page_break', 'letter_head', 'select_print_heading', 'print_heading'. Fixes frappe/erpnext#1810
 2014-09-10 15:24:52 +05:30
Anand Doshi
fc33d5a75b Set allow_on_submit for 'page_break', 'letter_head', 'select_print_heading', 'print_heading'. Fixes frappe/erpnext#1810 2014-09-09 15:25:43 +05:30
Pratik Vyas
6e566fb154 Merge branch 'develop' 2014-09-09 15:10:47 +05:30
Pratik Vyas
6675ce9036 bumped to version 4.3.0 2014-09-09 15:40:47 +06:00
Pratik Vyas
2cf75fcca2 change version in hooks.py 2014-09-09 15:10:18 +05:30
Anand Doshi
941f698daf Merge pull request #2165 from anandpdoshi/anand-september-9 
Fix in web clear cache for Item, cheque printing format
 2014-09-09 13:59:39 +05:30
Anand Doshi
48b3d1383f [minor] Cheque Printing Format 2014-09-09 12:59:16 +05:30
Anand Doshi
dc79334f1c [fix] Clear website cache for Item Group on saving Item 2014-09-09 12:35:15 +05:30
Anand Doshi
ab74a502e2 Merge pull request #2162 from nabinhait/hotfix 
Get items in PO from material requests based on supplier
 2014-09-09 12:07:27 +05:30
Nabin Hait
fa18e7c21f Merge pull request #2140 from nathando/patch-1 
get_item_list does not [item qty=0]
 2014-09-09 12:06:21 +05:30
Nabin Hait
ff7e9b6b22 Get items in PO from material requests based on supplier 2014-09-09 11:01:55 +05:30
Rushabh Mehta
00e93d1c1d Merge pull request #2159 from anandpdoshi/anand-september-8 
[minor] Set in_list_view for Sales and Purchase item tables
 2014-09-09 09:21:04 +05:30
Anand Doshi
45c9b1c065 [minor] Set in_list_view for Sales and Purchase item tables 2014-09-08 17:42:17 +05:30
Anand Doshi
dcfcd693c2 Merge pull request #2158 from rmehta/translated 
transations-08-sep-2014
 2014-09-08 15:30:15 +05:30
RM
7ab4ee1d79 transations-08-sep-2014 2014-09-08 09:28:34 +00:00