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

624 Commits

Author SHA1 Message Date
Frappe Bot
74fd5daeb2 Merge branch 'master' into develop 2019-02-15 10:22:33 +00:00
Deepesh Garg
4902f7b2a0 fix: Show tasks in timesheet with status as Closed (#16660) 2019-02-14 17:32:52 +05:30
Sagar Vora
551f52fd25 Merge branch 'master' into develop 2019-02-12 16:41:24 +05:30
Deepesh Garg
da7c20e474 fix: Validate task dates in project (#16586) 
* fix: Validate task dates in project

* fix: Test case fix and validation only if date exists

* fix: Added dates in error messages
 2019-02-12 12:55:50 +05:30
Sagar Vora
da1dc7fa52 Merge branch 'master' into develop 2019-02-05 18:40:39 +05:30
Rohit Waghchaure
a4645b6d17 fix: check open status projects for project status update 2019-02-01 11:37:22 +05:30
Saurabh
a342138625 Merge branch 'master' into develop 2019-01-30 12:38:58 +05:30
rohitwaghchaure
25e63e806c fix: modified date (#16520) 2019-01-30 11:46:34 +05:30
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +05:30
Nabin Hait
e8190473f5
Merge branch 'staging-fixes' into unicode 2019-01-29 11:13:04 +05:30
Frappe Bot
e415cce1a9 Merge branch 'staging' into develop 2019-01-23 08:19:00 +00:00
Nabin Hait
49e09624d6 fix(projects): None type handling while updating tasks 2019-01-23 10:43:00 +05:30
Aditya Hase
f3c22f342c fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30
Sagar Vora
4d1a9b10ed Merge branch 'staging' into develop 2019-01-22 15:56:39 +05:30
Rohit Waghchaure
7e71e132a3 Added patch 2019-01-18 11:47:31 +05:30
Nabin Hait
bef2c22d23 Fix: merge conflict 2019-01-18 10:15:47 +05:30
Rohit Waghchaure
425dff93d7 fix: Project update status code and design refactored 2019-01-17 19:21:44 +05:30
Rushabh Mehta
d254af9fea fix(patch): set_backup_limit.py 2019-01-11 15:07:26 +05:30
Nabin Hait
5c86cf54a2
Merge pull request #16288 from Anurag810/task-fixes 
[fix] 'Expected End Date' in task should not be later than 'Expected End Date' of project
 2019-01-11 14:21:58 +05:30
Anurag Mishra
cd8908362a Changes Requested Done 2019-01-11 12:23:23 +05:30
Frappe Bot
fdd5d54d41 Merge branch 'staging' into develop 2019-01-05 09:11:15 +00:00
Anurag Mishra
68aedfd176 typo 2019-01-04 11:00:07 +05:30
Anurag Mishra
f2b29a0488 typo 2019-01-04 10:54:05 +05:30
Sagar Vora
c14c7c84e3 fix: leave application and timesheet tests 2019-01-02 21:28:11 +05:30
Anurag Mishra
4c8c50e464 test case fixed 2019-01-02 17:52:28 +05:30
Anurag Mishra
a3b5f5f6e4 Test case 2019-01-01 14:11:59 +05:30
Anurag Mishra
3637e14e9f refractor 2018-12-28 17:11:52 +05:30
Suraj Shetty
3de12db2b1 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-27 09:05:25 +05:30
Frappe Bot
9e09b3adbe Merge branch 'staging' into develop 2018-12-26 12:16:20 +00:00
Frappe Bot
e8c2fdfb8c Merge branch 'master' into staging-fixes 2018-12-26 11:44:09 +00:00
Suraj Shetty
146be9f6a6 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-24 16:08:43 +05:30
Charles-Henri Decultot
083f1c5370 Safe decode project name for languages with special characters (#16254) 2018-12-24 14:21:33 +05:30
Suraj Shetty
83e3c4c0fa Fix quote error 2018-12-24 11:11:04 +05:30
Suraj Shetty
b2965001d1 Replace 'Make' with 'Create' 2018-12-23 13:25:58 +05:30
Frappe Bot
5b50b2848d Merge branch 'staging' into develop 2018-12-10 13:08:33 +00:00
Rohit Waghchaure
e61430b471 Removed unnecessary code 2018-12-03 18:54:26 +05:30
Rohit Waghchaure
636d186d08 [Fix] In project, tax amount is added in the total billed amount(sales) field 2018-12-03 16:04:08 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop 2018-11-28 08:28:37 +00:00
Nabin Hait
93595fa60a
Merge branch 'staging-fixes' into hotfix-child-task-error 2018-11-26 20:24:47 +05:30
Rohan Bansal
f838597b5f fix(task): Fix error when trying to convert a task into a group even if no child tasks exist 2018-11-20 13:18:05 +05:30
deepeshgarg007
4c366eed23 Minor issue fixes 2018-11-15 12:02:07 +05:30
Frappe Bot
b5c7b96a73 Merge branch 'staging' into develop 2018-11-13 11:33:31 +00:00
Pawan Mehta
aa0bed16f6 [fix] #14038-Std hours at company level to calculate timesheet hours (#15819) 
* [fix] #14038

* codacy fixes

* add end time calc method

* test case and rename function

* Update timesheet.py
 2018-11-12 16:40:07 +05:30
Ameya Shenoy
d1c467bcf5
Merge branch 'staging' into develop 2018-10-17 09:44:39 +00:00
JodeQ
10dfd4a48f Show project attachments in portal view 2018-10-15 14:28:27 +02:00
Ameya Shenoy
f90af80344
Merge branch 'staging' into develop 2018-10-11 06:58:53 +00:00
Shreya Shah
3855156b7d fix(project): If Project has no Tasks, let the status be set as Completed (#15639) 2018-10-10 14:45:40 +05:30
Suraj Shetty
4b404c4f1e Avoid multiple escapes (#15509) 2018-09-27 15:39:34 +05:30
Suraj Shetty
6ea3de9521 Fix quote issues (#15497) 
* Fix quotes issues

* Remove frappe.db.escape
- Handle escape in the update_linked_doctypes method
 2018-09-26 18:15:53 +05:30
Suraj Shetty
bfc195dd8b Changes to support refactor in frappe pg-poc branch (#15287) 
* Remove quotes from sql to make it compatible with postgres as well

* Fix queries
- Replace mysql specifc queries with standard ones

* Make repo URL chages to test pg-poc

* Add root passowrd to test site config

* Fix quotes issue

* Remove debug flag from a pricing rule query

* Remove python 3.6 version from travis.yml

* Fix improper query issue

* Fix incorrect query

* Fix a query

- This fix need to be changed when we will  start supporting postgres
since date_format is not supported by postgres

* Get price list map as dict

* Convert price_list_currency_map to dict
 2018-09-21 10:20:52 +05:30