Rushabh Mehta
|
59dc0ece9f
|
[enhance] added Lead Source master, fixes #6231
|
2016-09-16 11:44:49 +05:30 |
|
Nabin Hait
|
d5ebd79ad7
|
Fixed version conflict
|
2016-09-14 15:50:22 +05:30 |
|
Rohit Waghchaure
|
a5de83351e
|
[Fix] Timesheet patch
|
2016-09-13 12:36:37 +05:30 |
|
Rohit Waghchaure
|
0568238786
|
rename total_billing_hours to total_billable_hours in timesheet doctype
|
2016-09-12 23:00:24 +05:30 |
|
Rohit Waghchaure
|
7b6fdb77d0
|
rename total_billing_amount to total_billable_amount in timesheet doctype
|
2016-09-12 19:06:41 +05:30 |
|
Rohit Waghchaure
|
c940440fbe
|
patch and rearrangement of fields
|
2016-09-12 13:27:27 +05:30 |
|
Nabin Hait
|
e5d13f3156
|
Update set_student_guardian.py
|
2016-09-08 17:57:55 +05:30 |
|
Rohit Waghchaure
|
aaa6d1f1bc
|
patch fix
|
2016-09-08 12:34:36 +05:30 |
|
Nabin Hait
|
1bf8e70339
|
Update convert_timelog_to_timesheet.py
|
2016-09-07 17:19:27 +05:30 |
|
Nabin Hait
|
7c9d981614
|
Update convert_timelog_to_timesheet.py
|
2016-09-07 17:17:47 +05:30 |
|
Nabin Hait
|
0a0df2e433
|
fixed version conflict
|
2016-09-07 17:01:47 +05:30 |
|
Nabin Hait
|
23147ff881
|
Patch fixed
|
2016-09-07 16:59:55 +05:30 |
|
Nabin Hait
|
b8b228ed14
|
Fixed version conflict
|
2016-09-06 17:56:32 +05:30 |
|
Neil Trini Lasrado
|
52891b55d2
|
Fixed Student Guardian patch - reload issue
|
2016-09-06 17:50:42 +05:30 |
|
Nabin Hait
|
f79d7188de
|
Patch fixed
|
2016-09-06 17:47:19 +05:30 |
|
Rohit Waghchaure
|
b44efef094
|
[Issue] Fixed, supplier quotation item uom conversion
|
2016-09-06 17:21:38 +05:30 |
|
Neil Trini Lasrado
|
6a95723a70
|
Fixed Student Guardian patch - permission issue
|
2016-09-06 17:11:13 +05:30 |
|
Neil Trini Lasrado
|
49da25dd57
|
Added patch
|
2016-09-06 15:45:17 +05:30 |
|
Nabin Hait
|
23d79b7059
|
fixed version conflict
|
2016-09-02 16:19:54 +05:30 |
|
Nabin Hait
|
88d7e419ad
|
Merge pull request #6263 from nabinhait/timesheet_fix_101
Migrate employee field to timesheet only if it exists in time log
|
2016-09-02 16:18:12 +05:30 |
|
Nabin Hait
|
54254cca58
|
Update set_party_name_in_payment_entry.py
|
2016-09-02 16:17:42 +05:30 |
|
Nabin Hait
|
142f14dd5c
|
Migrate employee field to timesheet only if it exists in time log
|
2016-09-02 14:47:14 +05:30 |
|
Nabin Hait
|
15b26d8b1a
|
Fixed merge conflicts
|
2016-09-02 14:29:57 +05:30 |
|
Nabin Hait
|
5a4ca64c4a
|
Party name in Payment Entry and cheque print format
|
2016-09-02 14:20:01 +05:30 |
|
Rohit Waghchaure
|
d07557eaf6
|
[Fix] Updated timesheet status
|
2016-09-02 12:24:54 +05:30 |
|
Nabin Hait
|
5a101ef4c6
|
Fixed merge conflict
|
2016-09-01 12:43:24 +05:30 |
|
Rohit Waghchaure
|
86f143863f
|
[Patch] Check table exist
|
2016-09-01 12:37:20 +05:30 |
|
Nabin Hait
|
2490ea0b91
|
Fixed merge conflict
|
2016-09-01 12:29:31 +05:30 |
|
Nabin Hait
|
bb2bceef62
|
Merge pull request #6229 from rohitwaghchaure/pos_payment_issue
[POS] Fixed POS Sales Invoice when Payment Table is Empty
|
2016-09-01 12:25:31 +05:30 |
|
Rohit Waghchaure
|
7f165f19d2
|
[Fix] Timesheet employee is missing in patch
|
2016-09-01 12:07:21 +05:30 |
|
Rohit Waghchaure
|
774ce63b75
|
remove mode of payment, migrate mode of payment from v6 to v7
|
2016-08-31 21:21:41 +05:30 |
|
Nabin Hait
|
16e15283b5
|
Imported unicode literals
|
2016-08-31 12:33:22 +05:30 |
|
Rohit Waghchaure
|
da7fb70009
|
[Patch] Fixed error unknown column 'type' in 'field list'
|
2016-08-30 01:41:35 +05:30 |
|
Kanchan Chauhan
|
145f87c068
|
'Type' field added to Salary Component
|
2016-08-29 15:26:57 +05:30 |
|
Rohit Waghchaure
|
69aebf4db5
|
fixes test cases, added patch
|
2016-08-26 13:18:14 +05:30 |
|
Nabin Hait
|
0da75aede3
|
Fixed merge conflict
|
2016-08-26 12:40:02 +05:30 |
|
Rohit Waghchaure
|
e21e1ebae2
|
[Sales Return] Minor fix in patch
|
2016-08-26 12:31:41 +05:30 |
|
Nabin Hait
|
fbe1563101
|
Merge pull request #6168 from rohitwaghchaure/hotfix
[POS] Fixed payment gl entry for sales return
|
2016-08-26 11:58:46 +05:30 |
|
Rohit Waghchaure
|
efb5bf2cfc
|
[POS] Fixed payment gl entry for sales return
|
2016-08-25 16:23:47 +05:30 |
|
Rohit Waghchaure
|
0788ee62c1
|
Fixed patch, 'SalesInvoice' object has no attribute 'account_for_change_amount'
|
2016-08-25 12:46:34 +05:30 |
|
Rushabh Mehta
|
b9b36a2062
|
[minor] update salary structure company if not set
|
2016-08-24 15:20:43 +05:30 |
|
Rushabh Mehta
|
caeb9dc025
|
[minor] update salary structure company if not set
|
2016-08-24 15:14:48 +05:30 |
|
Nabin Hait
|
5c9a2b39bc
|
Revert "Ignore validating mandatory fields on converting timelogs to timesheets"
|
2016-08-22 14:36:33 +05:30 |
|
Nabin Hait
|
1b9f8006c2
|
Merge pull request #6140 from nabinhait/timesheet_patch_fix
Ignore validating mandatory fields on converting timelogs to timesheets
|
2016-08-22 14:36:08 +05:30 |
|
Nabin Hait
|
9239ed5c44
|
Ignore validating mandatory fields on converting timelogs to timesheets
|
2016-08-22 14:35:06 +05:30 |
|
Nabin Hait
|
6b3706aef8
|
Update move_employee_parent_to_child_in_salary_structure.py
|
2016-08-18 17:32:53 +05:30 |
|
Nabin Hait
|
b5951b72f3
|
Merge pull request #5924 from KanchanChauhan/salary-structure-changes
Formula based Salary Structure
|
2016-08-18 16:39:58 +05:30 |
|
Kanchan Chauhan
|
bccf0fa041
|
[WIP] Formula based Salary Structure and multiple employees for same Salary Structure
|
2016-08-18 13:02:39 +05:30 |
|
Rushabh Mehta
|
b7bc6bd75d
|
[fix] better message for cost center, fixes #6109
|
2016-08-18 12:50:58 +05:30 |
|
Nabin Hait
|
4da2c81641
|
Merge pull request #6094 from rmehta/sales-purchase-items
[revert] is_sales_item, is_purchase_item back
|
2016-08-17 11:30:37 +05:30 |
|