Nabin Hait
|
e9fa81c286
|
Merge pull request #6327 from rohitwaghchaure/timesheet_enhancement
[Enhancement] Timesheet billing based on project
|
2016-09-14 15:31:54 +05:30 |
|
Nabin Hait
|
2e8eff3456
|
Merge pull request #6352 from superlack/patch-1
Activity Summary to not show cancelled timesheets on click
|
2016-09-14 15:27:02 +05:30 |
|
Nabin Hait
|
9d095dcec2
|
Merge pull request #6364 from rohitwaghchaure/financial_statements_report_issue
[Fix] Financial Statements reports are running very slow
|
2016-09-14 15:25:26 +05:30 |
|
Rohit Waghchaure
|
b78eb2b6f2
|
[Fix] Financial Statements reports are running very slow
|
2016-09-14 13:33:27 +05:30 |
|
Rushabh Mehta
|
b6bca567ce
|
[fixes] [style] for web-form
|
2016-09-13 14:40:13 +05:30 |
|
superlack
|
1579565e52
|
Activity Summary to not show cancelled timesheets on click
Clicking an Activity Type in the Activity summary portion of project will add filter of "Status" != "Cancelled"
|
2016-09-12 21:18:41 -07:00 |
|
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 |
|
Nabin Hait
|
fcbb7692fa
|
Merge pull request #6322 from RobertSchouten/patch-23
leave balance now fy not calendar
|
2016-09-12 18:53:16 +05:30 |
|
Nabin Hait
|
b7c5b76ed1
|
Merge pull request #6321 from RobertSchouten/patch-22
allow users without employee with hr permission to view all calendars
|
2016-09-12 18:52:45 +05:30 |
|
Nabin Hait
|
9d9d1dceeb
|
Merge pull request #6314 from bcornwellmott/bom_desription
Fixed spelling
|
2016-09-12 18:45:21 +05:30 |
|
Nabin Hait
|
cd23530d24
|
Merge pull request #6324 from RobertSchouten/patch-24
stock entries from production_order dont fetch serial number of project
|
2016-09-12 18:35:13 +05:30 |
|
Nabin Hait
|
6c08f5caf9
|
Update stock_entry.py
|
2016-09-12 18:34:46 +05:30 |
|
Nabin Hait
|
d7b95267b3
|
Update production_planning_tool.py
|
2016-09-12 18:33:17 +05:30 |
|
Nabin Hait
|
ee3be536cb
|
Merge pull request #6349 from rohitwaghchaure/so_dn_required_issue
[Invoice] Fixed so_dn_required for is pos and update stock
|
2016-09-12 18:31:30 +05:30 |
|
Rohit Waghchaure
|
97a82714de
|
[Fix] so_dn_required for pos and stock update invoice
|
2016-09-12 18:04:17 +05:30 |
|
Nabin Hait
|
0a2c7a9a66
|
Merge pull request #6329 from bcornwellmott/quotecomp_add_supplier
Added supplier quotation filter for Quoted Item Comparison
|
2016-09-12 17:55:19 +05:30 |
|
Nabin Hait
|
97b661f995
|
Merge pull request #6334 from RobertSchouten/patch-27
[fix] itemwise sales register add sales invoice to delivery note when…
|
2016-09-12 17:53:10 +05:30 |
|
Nabin Hait
|
9821816e6c
|
Merge pull request #6337 from RobertSchouten/patch-28
[fix] status updater percent when qty is minus value
|
2016-09-12 17:37:48 +05:30 |
|
Nabin Hait
|
0a7c0f4418
|
Merge pull request #6338 from RobertSchouten/report_names
add customer and supplier names to some reports
|
2016-09-12 17:36:46 +05:30 |
|
Nabin Hait
|
014c30c90d
|
Merge pull request #6339 from rohitwaghchaure/pos_enhancement
[Enhancement] POS changes and fixes
|
2016-09-12 17:35:40 +05:30 |
|
Nabin Hait
|
d220298e69
|
Merge pull request #6343 from PawanMeh/fixes_6195
[fix] #6195
|
2016-09-12 17:34:40 +05:30 |
|
bcornwellmott
|
6594c841a7
|
Added color coding to timesheet calendars (#6269)
|
2016-09-12 16:43:23 +05:30 |
|
pawan
|
af111e9c43
|
[fix] #6195
|
2016-09-12 15:16:23 +05:30 |
|
Rohit Waghchaure
|
4eb908fc76
|
Doc updated for timesheet
|
2016-09-12 13:27:28 +05:30 |
|
Rohit Waghchaure
|
e1d59d6dde
|
test cases and minor changes
|
2016-09-12 13:27:28 +05:30 |
|
Rohit Waghchaure
|
1d0e8ea9c6
|
minor changes
|
2016-09-12 13:27:27 +05:30 |
|
Rohit Waghchaure
|
c940440fbe
|
patch and rearrangement of fields
|
2016-09-12 13:27:27 +05:30 |
|
Rohit Waghchaure
|
3815ebff8a
|
Added %billed in timesheet
|
2016-09-12 13:27:27 +05:30 |
|
Rohit Waghchaure
|
a6927e05ba
|
set project wise timesheet data
|
2016-09-12 13:27:27 +05:30 |
|
Rohit Waghchaure
|
cc8644f86e
|
[Timesheet] Field rearrange
|
2016-09-12 13:27:27 +05:30 |
|
Rohit Waghchaure
|
60a05324ce
|
POS changes and fixes
|
2016-09-12 13:11:10 +05:30 |
|
Nabin Hait
|
294664b24c
|
Merge pull request #6267 from PawanMeh/fixes_6254
[fix] #6254
|
2016-09-12 13:03:14 +05:30 |
|
robert schouten
|
4fc70d962b
|
add customer and supplier names to some reports
|
2016-09-12 15:23:51 +08:00 |
|
RobertSchouten
|
db33ebb0ff
|
[fix] status updater percent when qty is minus value
|
2016-09-12 14:54:46 +08:00 |
|
RobertSchouten
|
bd979ec1ed
|
[fix] itemwise sales register add sales invoice to delivery note when update stock
in item wise sales register put sales invoice into delivery note field when delivery note is null and update stock ticked
|
2016-09-12 09:46:10 +08:00 |
|
Ben Cornwell-Mott
|
8d0b826840
|
Added supplier quotation filter for Quoted Item Comparison
|
2016-09-09 08:00:54 -07:00 |
|
Saurabh
|
b835fef8ac
|
[enhancement] modify payment request to get payment url (#6097)
* [enhancement] modify payment request to get payment url
* redirect to payment url if payment initiated via shopping cart
|
2016-09-09 11:19:22 +05:30 |
|
RobertSchouten
|
b64fc33be1
|
stock entries from production_order dont fetch serial number of project
|
2016-09-09 11:08:39 +08:00 |
|
RobertSchouten
|
2efe20bd9a
|
stock entries from production_order dont fetch serial number of project
|
2016-09-09 11:05:22 +08:00 |
|
RobertSchouten
|
b7fc4b76e4
|
stock entries from production_order dont fetch serial number of project
stock entries from production_order dont fetch serial number of project
|
2016-09-09 11:02:33 +08:00 |
|
RobertSchouten
|
2ecddf58d2
|
leave balance now fy not calendar
changed the default from_date and to_date of Leave Balance Report to FY
|
2016-09-09 10:48:34 +08:00 |
|
RobertSchouten
|
93c095bf16
|
allow users without employee with hr permission to view all calendars
|
2016-09-09 10:15:56 +08:00 |
|
RobertSchouten
|
e4d3809c87
|
allow users without employee with hr permission to view all calendars
|
2016-09-09 10:14:07 +08:00 |
|
Nabin Hait
|
e5d13f3156
|
Update set_student_guardian.py
|
2016-09-08 17:57:55 +05:30 |
|
Nabin Hait
|
fff6e19479
|
Merge pull request #6318 from neilLasrado/develop
Rearranged fields in Student Applicant & Student, Split address field
|
2016-09-08 16:51:30 +05:30 |
|
Neil Trini Lasrado
|
1e060e98c5
|
Rearranged feilds in Student Applicant & Student, Split address feild
|
2016-09-08 16:12:39 +05:30 |
|
Nabin Hait
|
d97200cb5a
|
fixed version conflict
|
2016-09-07 17:20:45 +05:30 |
|
Nabin Hait
|
a8b8d81e2a
|
Merge branch 'hotfix'
|
2016-09-07 17:20:14 +05:30 |
|
Nabin Hait
|
3e669ca656
|
bumped to version 7.0.42
|
2016-09-07 17:50:14 +06:00 |
|