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

8937 Commits

Author SHA1 Message Date
Nabin Hait
b015f1b647 Fixed version conflict 2016-09-20 16:53:02 +05:30
Nabin Hait
1f912f67ae bumped to version 7.0.44 2016-09-20 17:22:10 +06:00
RobertSchouten
8d43b32c2c improvements to email digest (#6323) 2016-09-20 11:11:39 +05:30
Nabin Hait
b8eef64e5d Merge pull request #6325 from RobertSchouten/patch-26 
fix allow negatives in leave type check
 2016-09-20 11:00:31 +05:30
Nabin Hait
79fe1fad5d Merge pull request #6374 from RobertSchouten/salary_register 
print formatting for monthly Salary register
 2016-09-20 10:58:53 +05:30
Nabin Hait
33ea19d616 Merge pull request #6395 from RobertSchouten/payroll_date 
[minor] adding Payroll date field to process payroll and salary slip
 2016-09-20 10:57:32 +05:30
robert schouten
5c41c77c7e added posting date to process payroll and salary slip 2016-09-20 08:19:05 +08:00
Rohit Waghchaure
414199a5db [Fix] Mode of payment issue 2016-09-19 23:43:47 +05:30
Nabin Hait
383cb43135 Merge pull request #6393 from KanchanChauhan/gl-fix 
Against Voucher Type and Against Voucher added to GL
 2016-09-19 19:35:55 +05:30
Nabin Hait
b20c83de46 Merge pull request #6397 from neilLasrado/develop 
Added ability to Import Data via Data Import Tool in Instructor Doctype
 2016-09-19 19:25:41 +05:30
Nabin Hait
fe15fd622d Merge pull request #6398 from mainul94/Issue#6370 
Update Production Status Options
 2016-09-19 19:25:24 +05:30
Nabin Hait
902bcc07b5 Merge pull request #6401 from rmehta/fix-lead-link 
[fix] connect customer to Quotation, Opportunity if created from lead, fixes #6051
 2016-09-19 19:22:34 +05:30
Nabin Hait
acc3f43666 Merge pull request #6406 from rohitwaghchaure/add_sq_in_opportunity 
Opportunity, added supplier quotation in the dashboard
 2016-09-19 19:14:39 +05:30
Neil Trini Lasrado
93424e95f4 Added ability to Import Data via Data Import Tool in Instructor Doctype 2016-09-19 18:40:35 +05:30
Rohit Waghchaure
5b5f3743dd Opportunity, added supplier quotation in the dashboard 2016-09-19 18:36:21 +05:30
Rushabh Mehta
559aa3ab7c [enhance] show customer, supplier billing and outstanding, fixes #6078 2016-09-19 16:04:58 +05:30
Rushabh Mehta
5a58d8a11e [minor] production order link in material request, fixes #6197 2016-09-19 15:33:46 +05:30
Rushabh Mehta
bd15e31ea1 [minor] [enhance] fixes #6222 2016-09-19 15:27:09 +05:30
Rushabh Mehta
e35dbca01b [fix] connect customer to Quotation, Opportunity if created from lead, fixes #6051 2016-09-19 15:03:57 +05:30
Kanchan Chauhan
006a0e68bf Against Voucher Type and Against Voucher added to GL 2016-09-19 13:44:52 +05:30
Nabin Hait
17c43cd799 Merge pull request #6392 from KanchanChauhan/actual-qty-in-mri 
Actual Qty added to Material Request Item
 2016-09-19 13:32:31 +05:30
strixaluco
71073e1730 Update stock-entry.md 
Stock Reconciliation hyperlink added
 2016-09-19 15:38:38 +08:00
Mainul Islam
dbf2ce67a6 Fixed Issue#6370 2016-09-19 12:49:01 +06:00
Kanchan Chauhan
d1d129edf0 Actual Qty added to Material Request Item 2016-09-19 00:22:37 +05:30
Rohit Waghchaure
3c4cdd2a94 [Fix] Added base_url, print_css in pos 2016-09-19 00:17:32 +05:30
Rushabh Mehta
cf7a36ac26 [fix] fix patch to clear lead customization 2016-09-16 23:01:41 +05:30
Nabin Hait
5bab04fead Merge pull request #6381 from rmehta/lead-source 
[enhance] added Lead Source master, fixes #6231
 2016-09-16 16:58:40 +05:30
Nabin Hait
c4bf8c5493 Merge pull request #6383 from nabinhait/article_max_cols 
Article on maximum number of fields
 2016-09-16 16:58:15 +05:30
Saurabh
9919a0a9db [fix] #5992 2016-09-16 16:47:03 +05:30
Rushabh Mehta
39b5d39df6 [fix] remove campaign depends on 2016-09-16 15:55:34 +05:30
Nabin Hait
86e660f6c3 Article on maximum number of fields 2016-09-16 14:51:45 +05:30
Rushabh Mehta
59dc0ece9f [enhance] added Lead Source master, fixes #6231 2016-09-16 11:44:49 +05:30
Nabin Hait
56700ae148 Merge pull request #6356 from KanchanChauhan/job-application-webform 
Job Application web form
 2016-09-15 17:20:43 +05:30
Nabin Hait
f3fd2ce382 Merge pull request #6366 from rohitwaghchaure/opportunity_enhancement 
[Enhancement] Make supplier quotation from opportunity
 2016-09-15 17:18:51 +05:30
Nabin Hait
f79adfddf1 Merge pull request #6351 from RobertSchouten/patch-29 
PPT material request non-stock items
 2016-09-15 17:01:20 +05:30
Nabin Hait
3cef7d5ae9 Update production_planning_tool.py 2016-09-15 17:01:00 +05:30
Neil Trini Lasrado
bb5eb7d6f4 Added title to Student Admission (#6379) 2016-09-15 16:44:25 +05:30
Nabin Hait
b267673b8e Merge pull request #6373 from vrms/patch-2 
Patch 2
 2016-09-15 16:11:56 +05:30
Nabin Hait
756467c872 Merge pull request #6372 from vrms/patch-1 
Patch 1
 2016-09-15 16:11:45 +05:30
Neil Trini Lasrado
7e1b516103 fixes for student admission (#6377) 
* fixes for student admission

* Added Application Route to Student Admission
 2016-09-15 15:36:14 +05:30
Rushabh Mehta
769dda0874 [translation] [fixes] #5860 2016-09-15 15:17:04 +05:30
Neil Trini Lasrado
83d81203b2 Added Student Admissions (#6359) 
* Added Student Admissions

* Fixes for Student Application
 2016-09-15 14:48:13 +05:30
Rushabh Mehta
33d18dbc9a [docs] for auto email 2016-09-15 13:57:43 +05:30
Nabin Hait
759ef4c00d Allowed past dates in next depreciation date 2016-09-15 12:24:33 +05:30
robert schouten
32c366508a add print format and id to monthly salary register 2016-09-15 14:21:15 +08:00
vrms
05e33789aa Update index.md 2016-09-15 14:11:06 +08:00
vrms
6d34033c3f Update item-variants.md 
tried to bring out the implications and meaning of Variants (compared to a regular item) a little more detailed
 2016-09-15 14:05:13 +08:00
Nabin Hait
d5ebd79ad7 Fixed version conflict 2016-09-14 15:50:22 +05:30
Nabin Hait
72801043f1 bumped to version 7.0.43 2016-09-14 16:14:25 +06:00
Rohit Waghchaure
00295f2b8d make supplier quotation from opportunity 2016-09-14 15:36:40 +05:30