Commit Graph

16243 Commits

Author SHA1 Message Date
Nabin Hait
d64454b1c1 Merge pull request #6433 from RobertSchouten/validate_sale_ware
[fix] si validate warehouse if is_stock item
2016-09-22 11:41:36 +05:30
Nabin Hait
e5c7d4b987 Fixed version conflict 2016-09-22 11:33:51 +05:30
Nabin Hait
0967b17320 Merge branch 'hotfix' 2016-09-22 11:33:32 +05:30
Nabin Hait
b1041072a2 bumped to version 7.0.46 2016-09-22 12:03:32 +06:00
Nabin Hait
a58a65457f Sales Register report minor fix 2016-09-22 11:31:42 +05:30
robert schouten
f91ca3a450 [fix] si validate warehouse if is_stock item 2016-09-22 13:07:00 +08:00
Nabin Hait
993d7ca630 Merge pull request #6424 from rohitwaghchaure/daily_timesheet_summary_permission_issue
[Fix] Daily timesheet summary permission issue
2016-09-21 18:41:54 +05:30
Nabin Hait
be4c527453 Merge pull request #6426 from rohitwaghchaure/supplier_portal_enhancement
[Enhancement] Supplier quotation added on supplier portal
2016-09-21 18:41:21 +05:30
Nabin Hait
96d38eaac7 Merge pull request #6429 from rohitwaghchaure/minor_fix
[Fix] Image is copied when duplicate supplier, employee
2016-09-21 18:40:47 +05:30
Nabin Hait
0eb8eddef5 Merge pull request #6427 from KanchanChauhan/salary-slip-indentation
[Fix] Indentation fixed
2016-09-21 18:40:21 +05:30
Rohit Waghchaure
a7e3d11077 [Fix] Image is copied when duplicate supplier, employee 2016-09-21 18:13:16 +05:30
Kanchan Chauhan
2142a0ab37 [Fix] Indentation fixed 2016-09-21 17:28:42 +05:30
Rohit Waghchaure
21499e820d [Enhancement] Supplier quotation added on supplier portal 2016-09-21 17:07:25 +05:30
Nabin Hait
7108991039 Patch order changed 2016-09-21 16:34:44 +05:30
Rohit Waghchaure
342ec18b83 [Fix] Daily timesheet summary permission issue 2016-09-21 13:22:15 +05:30
Nabin Hait
0be6073f10 Fixed version conflict 2016-09-21 13:06:19 +05:30
Nabin Hait
6835a6fb49 Merge branch 'hotfix' 2016-09-21 13:05:26 +05:30
Nabin Hait
4fead63419 bumped to version 7.0.45 2016-09-21 13:35:26 +06:00
Nabin Hait
521b34c03b Merge pull request #6413 from KanchanChauhan/salaryslip-docfield-in-condition
Salary Slip fields in Condition and Formula
2016-09-21 12:55:27 +05:30
Nabin Hait
081eab147f Update salary_slip.py 2016-09-21 12:55:16 +05:30
Nabin Hait
06131dd0b1 Merge pull request #6420 from nabinhait/sales_reg_fix
Fix in Sales Register for multiple mode of payments
2016-09-21 12:54:25 +05:30
Rushabh Mehta
0c4597f7a0 [fix] license to the latest markdown format, github seems to consider this as agpl 2016-09-21 12:10:54 +05:30
Rushabh Mehta
301c8a94b8 [fix] [patch] update_lead_source 2016-09-21 12:00:58 +05:30
Rushabh Mehta
989a4849fe [minor] patch fix for 6-7 2016-09-21 12:00:58 +05:30
Nabin Hait
aac32d644d Fix in Sales Register for multiple mode of payments 2016-09-21 11:46:07 +05:30
Nabin Hait
d12990ff57 Update update_home_page.py 2016-09-20 18:20:58 +05:30
Nabin Hait
5cf5019b89 minor patch fix 2016-09-20 18:19:59 +05:30
Nabin Hait
9f4ca1fb9e set posting date in salalry slip 2016-09-20 18:19:59 +05:30
Nabin Hait
158ac5a844 Merge pull request #6416 from KanchanChauhan/minor-fix
[Fix] filters_by_name changed to query_report_filters_by_name
2016-09-20 18:14:00 +05:30
Nabin Hait
a36325c6e5 Merge pull request #6403 from saurabh6790/treeview_quick_entry_fix
[fix] minor fix to accomodate custom fields in tree popup
2016-09-20 18:06:49 +05:30
Nabin Hait
429a38f90b Merge pull request #6415 from rmehta/hotfix
[minor] bring back old grid style in material request
2016-09-20 18:05:32 +05:30
Kanchan Chauhan
77aaa70734 [Fix] filters_by_name changed to query_report_filters_by_name 2016-09-20 17:54:07 +05:30
Rushabh Mehta
57a1905576 [minor] bring back old grid style in material request 2016-09-20 17:22:54 +05:30
Nabin Hait
b015f1b647 Fixed version conflict 2016-09-20 16:53:02 +05:30
Nabin Hait
30a25e11f7 Merge branch 'hotfix' 2016-09-20 16:52:10 +05:30
Nabin Hait
1f912f67ae bumped to version 7.0.44 2016-09-20 17:22:10 +06:00
Kanchan Chauhan
e5057c8c35 Salary Slip fields in Condition and Formula 2016-09-20 14:59:42 +05:30
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
Nabin Hait
af03de3d00 Merge pull request #6399 from rohitwaghchaure/pos_payment_mode_type_missing_issue
[Fix] POS, mode of payment issue
2016-09-20 10:56:54 +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