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

16310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
4a121d60db Merge branch 'hotfix' 2016-09-14 15:44:25 +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
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
9c32baa1f4 Merge pull request #6355 from rohitwaghchaure/timesheet_calendar_permission_issue 
[Fix] Timesheet calendar permission issue
 2016-09-14 15:26:30 +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
Kanchan Chauhan
122d0791a3 Job Application web form 2016-09-13 14:29:02 +05:30
Rohit Waghchaure
4bd08182ac [Fix] Timesheet calendar permission issue 2016-09-13 13:35:53 +05:30
Nabin Hait
ae9990cb81 Merge pull request #6353 from rohitwaghchaure/patch_fix_for_timesheet 
[Fix] Timesheet patch
 2016-09-13 13:31:11 +05:30
Rohit Waghchaure
a5de83351e [Fix] Timesheet patch 2016-09-13 12:36:37 +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
RobertSchouten
4ca64c33eb Update production_planning_tool.json 2016-09-13 08:36:05 +08:00
RobertSchouten
5414725fd6 PPT material request non-stock items 2016-09-13 08:27:51 +08: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
33a20bdb13 Merge pull request #6340 from nabinhait/se_difference_account 
Remove Difference Account field from Stock Entry parent form
 2016-09-12 17:34:59 +05:30
Nabin Hait
d220298e69 Merge pull request #6343 from PawanMeh/fixes_6195 
[fix] #6195
 2016-09-12 17:34:40 +05:30
Nabin Hait
f314494555 Merge pull request #6345 from rohitwaghchaure/employee_name_missing 
[Fix] Employee name is missing in timesheet
 2016-09-12 17:34:13 +05:30
bcornwellmott
6594c841a7 Added color coding to timesheet calendars (#6269) 2016-09-12 16:43:23 +05:30
Rushabh Mehta
daee449063 [fix] for print format draft (#6346) 2016-09-12 16:42:36 +05:30
Rohit Waghchaure
03e5e68a7a [Fix] Employee name is missing in timesheet 2016-09-12 16:14:06 +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