Commit Graph

26644 Commits

Author SHA1 Message Date
rohitwaghchaure
4d2c307d6d
Merge pull request #17475 from netchampfaris/item-variant-attributes-optional
fix: Allow variant attributes to be optional
2019-05-09 00:54:45 +05:30
Deepesh Garg
35226b1f32
Merge pull request #17415 from deepeshgarg007/notification
feat: Track purchase receipt status in material request
2019-05-09 00:03:34 +05:30
Shivam Mishra
374999b048
feat: Password protected salary slips (#17380)
* feat: Added check for encrypting salary slips and password policy field

* feat: make password policy mandatory if encrypt option is selected

* feat: added password logic to email_salary_slip

* fix: import error

* chore: Minor enhancement to validations in salary slip

* fix: travis patch

* feat: Modified email body for password protected salary slips
2019-05-08 17:30:08 +05:30
rohitwaghchaure
bb439f7662
Merge pull request #17520 from rohitwaghchaure/added_validation_for_stock_entry_purpose_develop
fix: job card issue, added validation in the stock entry
2019-05-08 16:16:52 +05:30
Rohit Waghchaure
0cb7024e55 fix: job card issue, added validation in the stock entry 2019-05-08 15:14:12 +05:30
Saurabh
77bf60e1ac
Merge pull request #17384 from Mangesh-Khairnar/procurement-tracker
feat: Procurement Tracker Report
2019-05-08 13:44:29 +05:30
Saurabh
27e7ae6773
Merge branch 'develop' into procurement-tracker 2019-05-08 11:30:38 +05:30
deepeshgarg007
321124aa72 fix: Resolve merge conflict in json files 2019-05-08 10:33:08 +05:30
deepeshgarg007
e13a56cc80 Merge branch develop into notification 2019-05-08 10:16:30 +05:30
Faris Ansari
9a45bd11d6
Merge branch 'develop' into item-variant-attributes-optional 2019-05-07 14:25:03 +05:30
Faris Ansari
fde4fa7b60 fix(test): Convert values to list 2019-05-07 13:29:00 +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
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
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
Mangesh-Khairnar
09d4933edb fix: filter pi item based on po completeion 2019-05-06 12:53:52 +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
Mangesh-Khairnar
e003cc8812 fix: filter out completed purchase receipt 2019-05-03 16:41:04 +05:30
Mangesh-Khairnar
13d393247a feat: add date range filters 2019-05-03 16:00:02 +05:30
Faris Ansari
ab14892fc5 fix: Variant naming if optional attributes 2019-05-03 13:57:20 +05:30
Faris Ansari
cb03bb1c00 fix: Allow variant attributes to be optional 2019-05-03 13:41:50 +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
Nabin Hait
218d551c99
Merge pull request #17105 from nabinhait/gst-category-fieldtype
fix: Set GST Category fieldtype as Select in invoice
2019-05-02 12:43:09 +05:30
Nabin Hait
e1de2d64e5
Merge pull request #17450 from nabinhait/auto-account-creation-company-tree-dev
fix: Validate parent account of child company while creating new account based on parent company
2019-05-02 12:40:46 +05:30
Saurabh
7c5d3873fe
Merge branch 'develop' into auto-account-creation-company-tree-dev 2019-05-02 12:01:46 +05:30
Nabin Hait
5a7c5bc4dd
Merge pull request #17435 from rmehta/coa-sorting
fix(minor): chart of accounts sorting and message
2019-05-02 11:57:08 +05:30
Saurabh
321c0feed8
Merge branch 'develop' into woocommerce-multilingual-fix-dev 2019-05-02 11:46:53 +05:30
Rushabh Mehta
27a30c842d fix: simplify sort condition 2019-05-02 09:23:56 +05:30
Nabin Hait
3d64a5da5e
Merge pull request #17416 from asbasawaraj/add_status_field_in_campaign
feat: Additional fields in campaign
2019-05-02 03:18:22 +05:30