marination
|
752f099e9d
|
fix: Order Items by weightage in the web items query
|
2021-07-01 17:20:24 +05:30 |
|
Jannat Patel
|
5a4251107c
|
feat: Project Portal Enhancements (#26090)
* fix: project portal enhancements
* fix: timesheet table and task nesting
* fix: semgrep and link issue
* fix: sider
* fix: project details view title
* fix: project progress pills
* fix: website route rule for project
* fix: multi level nesting
* fix: added subject and indentation
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
|
2021-07-01 17:17:34 +05:30 |
|
18alantom
|
865900fd2d
|
refactor: add type hints, remove comment, sort imports
|
2021-07-01 14:37:37 +05:30 |
|
Anuja
|
039034ec33
|
Merge remote-tracking branch 'upstream/develop' into sa-vat-report
|
2021-07-01 14:16:14 +05:30 |
|
Anuja Pawar
|
d8bc514226
|
fix: to fetch the correct field in Tax Rule (#25927)
|
2021-07-01 14:06:01 +05:30 |
|
Nabin Hait
|
07a74abcc3
|
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
|
2021-07-01 12:55:13 +05:30 |
|
Nabin Hait
|
fa006402b8
|
fix: merge conflict
|
2021-07-01 12:47:28 +05:30 |
|
Ankush
|
d45e307f02
|
test: fix expected test failure (#26275)
reference: https://github.com/frappe/frappe/pull/13557
|
2021-07-01 12:38:09 +05:30 |
|
Nabin Hait
|
c2b5562a3f
|
Merge branch 'version-13-pre-release' into version-13
|
2021-07-01 12:37:13 +05:30 |
|
Nabin Hait
|
eee03fcbab
|
bumped to version 13.6.0
|
2021-07-01 12:57:13 +05:50 |
|
rohitwaghchaure
|
117cf4eca6
|
Merge pull request #26278 from rohitwaghchaure/fixed-employee-selection-issue-in-payroll-entry
fix: employee selection not working in payroll entry
|
2021-07-01 12:31:45 +05:30 |
|
Nabin Hait
|
d7c4818a5d
|
Merge pull request #26281 from rohitwaghchaure/fixed-update-cost-not-working-for-draft-bom-pre
fix: update cost not working in the draft BOM
|
2021-07-01 12:30:55 +05:30 |
|
Nabin Hait
|
9a4926bb0d
|
Merge pull request #26280 from rohitwaghchaure/fixed-employee-selection-issue-in-payroll-entry-pre
fix: employee selection not working in payroll entry
|
2021-07-01 12:30:13 +05:30 |
|
Rohit Waghchaure
|
f99f872946
|
fix: update cost not working in the draft bom
|
2021-07-01 12:02:37 +05:30 |
|
Rohit Waghchaure
|
87b4e6ea32
|
fix: employee selection not working in payroll entry
|
2021-07-01 12:02:03 +05:30 |
|
rohitwaghchaure
|
c14fc9530c
|
Merge pull request #26279 from rohitwaghchaure/fixed-update-cost-not-working-for-draft-bom
fix: update cost not working in the draft BOM
|
2021-07-01 11:57:32 +05:30 |
|
Rohit Waghchaure
|
a856624ccb
|
fix: employee selection not working in payroll entry
|
2021-07-01 11:56:55 +05:30 |
|
Rohit Waghchaure
|
0bfd56e615
|
fix: update cost not working in the draft bom
|
2021-07-01 11:50:48 +05:30 |
|
Deepesh Garg
|
68c697b354
|
fix: Auto process deferred accounting for multi-company setup
|
2021-07-01 09:31:31 +05:30 |
|
Dany Robert
|
4023ed8356
|
Merge branch 'develop' into patch-5
|
2021-06-30 22:43:00 +05:30 |
|
Nabin Hait
|
cf4e29a604
|
chore: Added change log for v13.6.0
|
2021-06-30 20:27:43 +05:30 |
|
Deepesh Garg
|
970d90f3b2
|
Merge pull request #25970 from GangaManoj/exchange-rate-difference-handling
feat: Exchange rate difference handling in procurement cycle
|
2021-06-30 20:25:39 +05:30 |
|
Anupam
|
03f7609a8b
|
fix: moving campaign from selling to CRM
|
2021-06-30 18:18:03 +05:30 |
|
Anupam Kumar
|
4df54cc62c
|
Merge pull request #26269 from anupamvs/payroll-iss-pre-release
fix: fetching employee in payroll entry
|
2021-06-30 17:22:17 +05:30 |
|
Anupam
|
8492bf040d
|
fix: feating employee in payroll entry
|
2021-06-30 17:17:43 +05:30 |
|
Deepesh Garg
|
cf7af62b05
|
fix: Code cleanup
|
2021-06-30 14:14:32 +05:30 |
|
rohitwaghchaure
|
d482c41eeb
|
Merge pull request #26263 from rohitwaghchaure/fixed-removed-unused-file
fix: minor removed unused file
|
2021-06-30 11:36:51 +05:30 |
|
Rohit Waghchaure
|
815e6ec846
|
fix: minor removed unused file
|
2021-06-30 11:35:50 +05:30 |
|
rohitwaghchaure
|
2a1d1e1cb1
|
Merge pull request #26240 from rohitwaghchaure/production-plan-sub-assembly-enhancement
feat: provision to make subcontracted purchase order from the production plan
|
2021-06-30 11:15:11 +05:30 |
|
rohitwaghchaure
|
713c92e6fd
|
Merge pull request #26259 from rohitwaghchaure/fixed-incorrect-valuation-rate-in-stock-reco
fix: incorrect valuation rate in stock reconciliation
|
2021-06-30 11:11:41 +05:30 |
|
Rucha Mahabal
|
77b0b8a877
|
fix: edit node button overflowing
|
2021-06-30 02:29:16 +05:30 |
|
Rucha Mahabal
|
b8a18bfef1
|
feat: add arc to connectors in mobile view
|
2021-06-30 01:57:43 +05:30 |
|
Rucha Mahabal
|
a7507f7af6
|
refactor: use arcs instead of bezier curves for cleaner connectors
|
2021-06-30 01:46:10 +05:30 |
|
Rohit Waghchaure
|
46b67b901b
|
fix: incorrect valuation rate in stock reconciliation
|
2021-06-30 00:31:00 +05:30 |
|
Rucha Mahabal
|
7558b28b79
|
fix: revert changes in employee descendants query
|
2021-06-29 21:57:27 +05:30 |
|
Rucha Mahabal
|
c40b9d276e
|
feat: setup node edit action
|
2021-06-29 21:51:21 +05:30 |
|
Rucha Mahabal
|
f15e8b7f5a
|
refactor: add options to chart
- method to return the node data
- wrapper for showing the hierarchy
|
2021-06-29 21:26:47 +05:30 |
|
Deepesh Garg
|
a287b22b55
|
Merge pull request #26252 from deepeshgarg007/loan_security_pledge_on_cancel
fix: Cancellation of Loan Security Pledges
|
2021-06-29 20:23:46 +05:30 |
|
Rohit Waghchaure
|
61690775a8
|
feat: provision to make subcontracted purchase order from the production plan
|
2021-06-29 19:59:20 +05:30 |
|
Rucha Mahabal
|
bcc998e8c2
|
chore: create separate files for Desktop and Mobile view and bundle assets
|
2021-06-29 19:15:08 +05:30 |
|
Rucha Mahabal
|
b7c61ff651
|
fix: don't refresh connections for same node
- remove all connectors while expanding a group node
|
2021-06-29 18:21:42 +05:30 |
|
GangaManoj
|
b4b6c8e262
|
Revert "fix: Test"
This reverts commit feed97ec53.
|
2021-06-29 17:58:39 +05:30 |
|
Rucha Mahabal
|
f5314293c6
|
feat: connectors for mobile node cards
|
2021-06-29 17:48:44 +05:30 |
|
Deepesh Garg
|
9181dde86a
|
fix: Cancelation of Loan Security Pledges
|
2021-06-29 17:18:39 +05:30 |
|
Rucha Mahabal
|
1f10a99910
|
fix: Employee Inactive status implications (#26245)
|
2021-06-29 15:58:56 +05:30 |
|
Rucha Mahabal
|
91dcc07e26
|
fix: Employee Inactive status implications (#26244)
|
2021-06-29 15:58:46 +05:30 |
|
Rucha Mahabal
|
8f2b8e47f7
|
fix: Employee Inactive status implications (#26243)
|
2021-06-29 15:58:30 +05:30 |
|
Rucha Mahabal
|
25e8723032
|
fix: expanded node group interactions and visibility
|
2021-06-29 15:06:09 +05:30 |
|
Rucha Mahabal
|
6e3a7b4a75
|
feat(mobile): sibling node group expansion and rendering
|
2021-06-29 11:12:47 +05:30 |
|
rohitwaghchaure
|
09b081ccad
|
Merge pull request #26241 from rohitwaghchaure/fixed-allow-to-change-to-date
fix: allow user to change the To Date in the blanket order even after submit of order
|
2021-06-29 10:05:04 +05:30 |
|