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

26632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Himanshu Warekar
c4fe98391b fix: set now_datetime 2019-05-11 09:38:08 +05:30
Himanshu Warekar
a8f9698082 fix: call the correct function 2019-05-11 00:01:43 +05:30
Himanshu Warekar
6e6148be39 fix: calculate variance 2019-05-10 23:49:42 +05:30
Himanshu Warekar
488432c0e8 fix: display sla status 2019-05-09 11:50:09 +05:30
Himanshu Warekar
5aba75d74d fix: show priority change dialog 2019-05-08 00:22:26 +05:30
Himanshu Warekar
91478181cb Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-05-07 23:43:06 +05:30
Himanshu Warekar
fc3232a9db fix: compare timedeltas directly 2019-05-07 23:42:38 +05:30
Faris Ansari
23fecc0dbb perf: Task import with Project (#17496) 
When tasks are imported with their Project set, import slows down as
number of tasks increase. This is largely due to `load_tasks` being
called in Project which is only required when Form loads. So, we can
skip it during import.

Also, converted some get_doc calls to get_cached_doc.
 2019-05-07 12:38:24 +05:30
Faris Ansari
a90fe810b3 fix(UX): Cancel tasks if project is cancelled (#17497) 2019-05-07 12:37:38 +05:30
Himanshu Warekar
1bfef6a600 fix: code fixes 2019-05-07 10:46:52 +05:30
Himanshu Warekar
9563835b61 fix: miscellaneous fixes 2019-05-07 10:40:02 +05:30
Himanshu Warekar
cf37e401f8 fix: change agreement status only if ongoing 2019-05-07 10:27:01 +05:30
Saurabh
3083d8d453
Merge pull request #17503 from netchampfaris/fix-product-configurator 
fix: Dont include disabled items in cache
 2019-05-07 09:12:28 +05:30
Himanshu Warekar
c5999154e6 fix: test cases and use orm 2019-05-06 23:43:16 +05:30
Faris Ansari
ff9177a6ce fix: Handle attribute filter when no items found 2019-05-06 15:59:51 +05:30
Faris Ansari
aa7ce883ed fix: Dont include disabled items in cache 2019-05-06 15:59:34 +05:30
Himanshu Warekar
aa0eaab3df fix: codacy 2019-05-06 01:35:11 +05:30
Himanshu Warekar
785f98efd9 minor: change autoname for sla 2019-05-06 00:43:38 +05:30
Himanshu Warekar
9faaa17d9d patch: fixes 2019-05-05 23:55:17 +05:30
Himanshu Warekar
f8b9c849a1 fix: test cases for sla 2019-05-05 22:51:18 +05:30
Himanshu Warekar
fbb7ea4856 fix: patch fix 2019-05-05 17:21:38 +05:30
Himanshu Warekar
134ad61604 fix: patch fixes 2019-05-05 16:26:11 +05:30
Himanshu Warekar
917e534191 patch: fix to migrate to new sla structure 2019-05-05 14:43:11 +05:30
Himanshu Warekar
e9b159c500 Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-05-05 12:45:50 +05:30
Himanshu Warekar
ec54e3d831 patch: migrate to new sla structure 2019-05-05 12:31:04 +05:30
Himanshu Warekar
b3070ca765 fix: display sla indicators at the top 2019-05-05 12:19:08 +05:30
Himanshu Warekar
898ab61dd4 fix: Child table for priority 2019-05-04 23:16:02 +05:30
Himanshu
ac1ce5d205 fix: Remove Scheduling Tool if exists (#17473) 
* fix: scheduling tool

* fix: patch for scheduling tool

* fix: remve drop table
 2019-05-04 22:43:37 +05:30
Rohan
174aa24529 fix(stock): Allow expired batches to be flushed out of the system (#17478) 2019-05-04 22:41:05 +05:30
Rushabh Mehta
e12bedc0c2 fix: unlink task rather than deleting it (#17485) 2019-05-04 22:39:31 +05:30
Faris Ansari
14425575b7 fix: Rebuild cache in background (#17487) 2019-05-04 22:38:13 +05:30
Himanshu
5cf12a4640 fix(Purchase Order): fetch payment terms (#17121) 
* fix: fetch payment terms

* fix: test fixes

* fix: test cases

* fix: test case

* fix: check for payment terms fetching

* fix: test cases

* refactor: fetch payment terms in account settings

* fix: add fetch terms to account settings
 2019-05-04 22:37:35 +05:30
Himanshu Warekar
24442af9ae fix: use list comprehension 2019-05-04 22:35:52 +05:30
Himanshu Warekar
fbed6a12d5 fix: calculate percentage only if sales team exist 2019-05-04 22:35:52 +05:30
Himanshu Warekar
40b99e3347 fix: sales percentage equal to 100 2019-05-04 22:35:52 +05:30
Himanshu Warekar
5ca977a41c fix: python side validation 2019-05-04 22:35:52 +05:30
Himanshu Warekar
76eddcc29f fix: validate percentage total 2019-05-04 22:35:52 +05:30
Rushabh Mehta
78827d8d79
Merge pull request #17484 from rmehta/fix-demo-style 
fix(style): demo home page
 2019-05-04 11:10:06 +05:30
Rushabh Mehta
2df16b1f9b fix(style): demo home page 2019-05-04 11:09:19 +05:30
Himanshu Warekar
00a494f07b fix: change sla on priority 2019-05-03 12:44:35 +05:30
Deepesh Garg
8ca3df7aac
Merge pull request #17466 from deepeshgarg007/inactive-items-fix-develop 
fix: Inactive sales items report fix
 2019-05-03 11:54:05 +05:30
deepeshgarg007
3c1b9aa77b fix: Remove patch 2019-05-03 09:47:38 +05:30
Nabin Hait
f13abe8332
Merge pull request #17464 from Mangesh-Khairnar/task-unlink 
feat: unlink task from project on task deletion
 2019-05-03 09:20:34 +05:30
deepeshgarg007
6c6b24011f Merge branch 'develop' of https://github.com/frappe/erpnext into inactive-items-fix-develop 2019-05-02 23:03:59 +05:30
Nabin Hait
ae0e1da091
Merge pull request #17461 from nabinhait/project-billing-summary-dev 
refactor: Project and billing summary
 2019-05-02 21:48:28 +05:30
Faris Ansari
b9dc4687dc
fix: Remove parens 2019-05-02 20:14:16 +05:30
deepeshgarg007
9ae112bbfc fix: Inactive items report fix 2019-05-02 19:38:15 +05:30
Mangesh-Khairnar
ffd4990a70 feat: unlink task from project on task deletion 2019-05-02 19:19:03 +05:30
Nabin Hait
73041269e9 refactor: Project and billing summary 2019-05-02 18:13:31 +05:30
Nabin Hait
bd0d10f82a
Merge pull request #17448 from nabinhait/woocommerce-multilingual-fix-dev 
fix: Multilingual handling in woocommerce integration
 2019-05-02 12:57:34 +05:30